[Python-checkins] bpo-38400 Don't check for NULL linked list pointers in _PyObject_IsFreed (GH-16630)

Pablo Galindo webhook-mailer at python.org
Mon Oct 7 19:43:18 EDT 2019


https://github.com/python/cpython/commit/36e33c360ed7716a2b5ab2b53210da81f8ce1295
commit: 36e33c360ed7716a2b5ab2b53210da81f8ce1295
branch: master
author: Pablo Galindo <Pablogsal at gmail.com>
committer: GitHub <noreply at github.com>
date: 2019-10-08T00:43:14+01:00
summary:

bpo-38400 Don't check for NULL linked list pointers in _PyObject_IsFreed (GH-16630)

Some objects like Py_None are not initialized with conventional means
that prepare the circular linked list pointers, leaving them unlinked
from the rest of the objects. For those objects, NULL pointers does
not mean that they are freed, so we need to skip the check in those
cases.

files:
M Objects/object.c

diff --git a/Objects/object.c b/Objects/object.c
index ae76e33e1f4f1..2c8e823f05ee9 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -454,9 +454,12 @@ _PyObject_IsFreed(PyObject *op)
     /* ignore op->ob_ref: its value can have be modified
        by Py_INCREF() and Py_DECREF(). */
 #ifdef Py_TRACE_REFS
-    if (_PyMem_IsPtrFreed(op->_ob_next) || _PyMem_IsPtrFreed(op->_ob_prev)) {
+    if (op->_ob_next != NULL && _PyMem_IsPtrFreed(op->_ob_next)) {
         return 1;
     }
+    if (op->_ob_prev != NULL && _PyMem_IsPtrFreed(op->_ob_prev)) {
+         return 1;
+     }
 #endif
     return 0;
 }



More information about the Python-checkins mailing list