diff options
| author | Mark Shannon <mark@hotpy.org> | 2021-06-10 11:37:22 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-10 11:37:22 (GMT) |
| commit | 31aa0dbff4c1d39c9d77c6c8f4a61d0e46c1268b (patch) | |
| tree | 1ce0b4151af7504e454ec387be4406d8fdc1e537 | |
| parent | 54cb63863f19a7c64d9a3a5fd97bdfc0dd7ab374 (diff) | |
| download | cpython-31aa0dbff4c1d39c9d77c6c8f4a61d0e46c1268b.zip cpython-31aa0dbff4c1d39c9d77c6c8f4a61d0e46c1268b.tar.gz cpython-31aa0dbff4c1d39c9d77c6c8f4a61d0e46c1268b.tar.bz2 | |
bpo-44363: Get test_capi passing with address sanitizer (GH-26639)
| -rw-r--r-- | Include/Python.h | 11 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2021-06-10-11-19-43.bpo-44363.-K9jD0.rst | 2 | ||||
| -rw-r--r-- | Modules/_testcapimodule.c | 5 |
3 files changed, 17 insertions, 1 deletions
diff --git a/Include/Python.h b/Include/Python.h index 4d0335d..04858f2 100644 --- a/Include/Python.h +++ b/Include/Python.h @@ -63,13 +63,22 @@ #include "pyport.h" #include "pymacro.h" -/* A convenient way for code to know if clang's memory sanitizer is enabled. */ +/* A convenient way for code to know if sanitizers are enabled. */ #if defined(__has_feature) # if __has_feature(memory_sanitizer) # if !defined(_Py_MEMORY_SANITIZER) # define _Py_MEMORY_SANITIZER # endif # endif +# if __has_feature(address_sanitizer) +# if !defined(_Py_ADDRESS_SANITIZER) +# define _Py_ADDRESS_SANITIZER +# endif +# endif +#elif defined(__GNUC__) +# if defined(__SANITIZE_ADDRESS__) +# define _Py_ADDRESS_SANITIZER +# endif #endif #include "pymath.h" diff --git a/Misc/NEWS.d/next/Tests/2021-06-10-11-19-43.bpo-44363.-K9jD0.rst b/Misc/NEWS.d/next/Tests/2021-06-10-11-19-43.bpo-44363.-K9jD0.rst new file mode 100644 index 0000000..28468cb --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-06-10-11-19-43.bpo-44363.-K9jD0.rst @@ -0,0 +1,2 @@ +Account for address sanitizer in test_capi. test_capi now passes when run +GCC address sanitizer. diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index ab47949..b983dee 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -4784,6 +4784,10 @@ check_pyobject_forbidden_bytes_is_freed(PyObject *self, PyObject *Py_UNUSED(args static PyObject* check_pyobject_freed_is_freed(PyObject *self, PyObject *Py_UNUSED(args)) { + /* This test would fail if run with the address sanitizer */ +#ifdef _Py_ADDRESS_SANITIZER + Py_RETURN_NONE; +#else PyObject *op = _PyObject_CallNoArg((PyObject *)&PyBaseObject_Type); if (op == NULL) { return NULL; @@ -4793,6 +4797,7 @@ check_pyobject_freed_is_freed(PyObject *self, PyObject *Py_UNUSED(args)) Py_SET_REFCNT(op, 1); /* object memory is freed! */ return test_pyobject_is_freed("check_pyobject_freed_is_freed", op); +#endif } |