diff options
| author | Victor Stinner <vstinner@python.org> | 2019-10-07 16:42:01 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 16:42:01 (GMT) |
| commit | 6876257eaabdb30f27ebcbd7d2557278ce2e5705 (patch) | |
| tree | 05597a0310d1e330c0c156c97f0fbc8a6386675e /Modules | |
| parent | 321def805abc5b7c92c7e90ca90cb2434fdab855 (diff) | |
| download | cpython-6876257eaabdb30f27ebcbd7d2557278ce2e5705.zip cpython-6876257eaabdb30f27ebcbd7d2557278ce2e5705.tar.gz cpython-6876257eaabdb30f27ebcbd7d2557278ce2e5705.tar.bz2 | |
bpo-36389: _PyObject_CheckConsistency() available in release mode (GH-16612)
bpo-36389, bpo-38376: The _PyObject_CheckConsistency() function is
now also available in release mode. For example, it can be used to
debug a crash in the visit_decref() function of the GC.
Modify the following functions to also work in release mode:
* _PyDict_CheckConsistency()
* _PyObject_CheckConsistency()
* _PyType_CheckConsistency()
* _PyUnicode_CheckConsistency()
Other changes:
* _PyMem_IsPtrFreed(ptr) now also returns 1 if ptr is NULL
(equals to 0).
* _PyBytesWriter_CheckConsistency() now returns 1 and is only used
with assert().
* Reorder _PyObject_Dump() to write safe fields first, and only
attempt to render repr() at the end.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_testcapimodule.c | 9 | ||||
| -rw-r--r-- | Modules/gcmodule.c | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c index 3f3ed66..c009d25 100644 --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -4612,6 +4612,14 @@ test_pyobject_is_freed(const char *test_name, PyObject *op) static PyObject* +check_pyobject_null_is_freed(PyObject *self, PyObject *Py_UNUSED(args)) +{ + PyObject *op = NULL; + return test_pyobject_is_freed("check_pyobject_null_is_freed", op); +} + + +static PyObject* check_pyobject_uninitialized_is_freed(PyObject *self, PyObject *Py_UNUSED(args)) { PyObject *op = (PyObject *)PyObject_Malloc(sizeof(PyObject)); @@ -5475,6 +5483,7 @@ static PyMethodDef TestMethods[] = { {"pymem_api_misuse", pymem_api_misuse, METH_NOARGS}, {"pymem_malloc_without_gil", pymem_malloc_without_gil, METH_NOARGS}, {"pymem_getallocatorsname", test_pymem_getallocatorsname, METH_NOARGS}, + {"check_pyobject_null_is_freed", check_pyobject_null_is_freed, METH_NOARGS}, {"check_pyobject_uninitialized_is_freed", check_pyobject_uninitialized_is_freed, METH_NOARGS}, {"check_pyobject_forbidden_bytes_is_freed", check_pyobject_forbidden_bytes_is_freed, METH_NOARGS}, {"check_pyobject_freed_is_freed", check_pyobject_freed_is_freed, METH_NOARGS}, diff --git a/Modules/gcmodule.c b/Modules/gcmodule.c index b95f676..107ce39 100644 --- a/Modules/gcmodule.c +++ b/Modules/gcmodule.c @@ -375,7 +375,6 @@ update_refs(PyGC_Head *containers) static int visit_decref(PyObject *op, void *data) { - assert(op != NULL); _PyObject_ASSERT(op, !_PyObject_IsFreed(op)); if (PyObject_IS_GC(op)) { |