bpo-9263: Fix _PyObject_Dump() for freed object (#10661)
If _PyObject_Dump() detects that the object is freed, don't try to dump it (exit immediately). Enhance also _PyObject_IsFreed(): it now detects if the pointer itself looks like freed memory.
This commit is contained in:
parent
9a0d7a7648
commit
2cf5d32fd9
|
@ -423,6 +423,10 @@ _Py_BreakPoint(void)
|
|||
int
|
||||
_PyObject_IsFreed(PyObject *op)
|
||||
{
|
||||
uintptr_t ptr = (uintptr_t)op;
|
||||
if (_PyMem_IsFreed(&ptr, sizeof(ptr))) {
|
||||
return 1;
|
||||
}
|
||||
int freed = _PyMem_IsFreed(&op->ob_type, sizeof(op->ob_type));
|
||||
/* ignore op->ob_ref: the value can have be modified
|
||||
by Py_INCREF() and Py_DECREF(). */
|
||||
|
@ -448,6 +452,7 @@ _PyObject_Dump(PyObject* op)
|
|||
/* It seems like the object memory has been freed:
|
||||
don't access it to prevent a segmentation fault. */
|
||||
fprintf(stderr, "<freed object>\n");
|
||||
return;
|
||||
}
|
||||
|
||||
PyGILState_STATE gil;
|
||||
|
|
Loading…
Reference in New Issue