mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-01 15:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

gh-105927: Fix test_weakref_capi() refleak (#105966)

Browse source 
Test PyWeakref_GetRef(NULL) and  PyWeakref_GetObject(NULL).
This commit is contained in:
Victor Stinner 2023-06-21 16:35:41 +02:00 • committed by GitHub
parent 48d107a87d
commit 2178bbc121
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Modules/_testcapimodule.c
View file

@ -3395,27 +3395,29 @@ test_weakref_capi(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
Py_DECREF(obj); Py_DECREF(obj);
return NULL; return NULL;
} }
// test PyWeakref_Check(), valid weakref object
assert(PyWeakref_Check(weakref)); assert(PyWeakref_Check(weakref));
assert(PyWeakref_CheckRefExact(weakref)); assert(PyWeakref_CheckRefExact(weakref));
assert(PyWeakref_CheckRefExact(weakref)); assert(PyWeakref_CheckRefExact(weakref));
assert(Py_REFCNT(obj) == refcnt); assert(Py_REFCNT(obj) == refcnt);
// test PyWeakref_GetRef(), reference is alive // test PyWeakref_GetRef(), reference is alive
PyObject *ref1; PyObject *ref = Py_True; // marker to check that value was set
assert(PyWeakref_GetRef(weakref, &ref1) == 0); assert(PyWeakref_GetRef(weakref, &ref) == 0);
assert(ref1 == obj); assert(ref == obj);
assert(Py_REFCNT(obj) == (refcnt + 1)); assert(Py_REFCNT(obj) == (refcnt + 1));
Py_DECREF(ref1); Py_DECREF(ref);
// test PyWeakref_GetObject(), reference is alive // test PyWeakref_GetObject(), reference is alive
PyObject *ref2 = PyWeakref_GetObject(weakref); ref = PyWeakref_GetObject(weakref); // borrowed ref
assert(ref2 == obj); assert(ref == obj);
// test PyWeakref_GET_OBJECT(), reference is alive // test PyWeakref_GET_OBJECT(), reference is alive
PyObject *ref3 = PyWeakref_GET_OBJECT(weakref); ref = PyWeakref_GET_OBJECT(weakref); // borrowed ref
assert(ref3 == obj); assert(ref == obj);
// delete the referenced object // delete the referenced object: clear the weakref
assert(Py_REFCNT(obj) == 1); assert(Py_REFCNT(obj) == 1);
Py_DECREF(obj); Py_DECREF(obj);
@ -3423,11 +3425,11 @@ test_weakref_capi(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
assert(PyWeakref_GET_OBJECT(weakref) == Py_None); assert(PyWeakref_GET_OBJECT(weakref) == Py_None);
// test PyWeakref_GetRef(), reference is dead // test PyWeakref_GetRef(), reference is dead
PyObject *ref4 = Py_True; // marker to check that value was set ref = Py_True;
assert(PyWeakref_GetRef(weakref, &ref4) == 0); assert(PyWeakref_GetRef(weakref, &ref) == 0);
assert(ref4 == NULL); assert(ref == NULL);
// None is not a weak reference object // test PyWeakref_Check(), not a weakref object
PyObject *invalid_weakref = Py_None; PyObject *invalid_weakref = Py_None;
assert(!PyWeakref_Check(invalid_weakref)); assert(!PyWeakref_Check(invalid_weakref));
assert(!PyWeakref_CheckRefExact(invalid_weakref)); assert(!PyWeakref_CheckRefExact(invalid_weakref));
@ -3435,17 +3437,31 @@ test_weakref_capi(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(args))
// test PyWeakref_GetRef(), invalid type // test PyWeakref_GetRef(), invalid type
assert(!PyErr_Occurred()); assert(!PyErr_Occurred());
PyObject *ref5 = Py_True; // marker to check that value was set ref = Py_True;
assert(PyWeakref_GetRef(invalid_weakref, &ref5) == -1); assert(PyWeakref_GetRef(invalid_weakref, &ref) == -1);
assert(PyErr_ExceptionMatches(PyExc_TypeError)); assert(PyErr_ExceptionMatches(PyExc_TypeError));
PyErr_Clear(); PyErr_Clear();
assert(ref5 == NULL); assert(ref == NULL);
// test PyWeakref_GetObject(), invalid type // test PyWeakref_GetObject(), invalid type
assert(PyWeakref_GetObject(invalid_weakref) == NULL); assert(PyWeakref_GetObject(invalid_weakref) == NULL);
assert(PyErr_ExceptionMatches(PyExc_SystemError)); assert(PyErr_ExceptionMatches(PyExc_SystemError));
PyErr_Clear(); PyErr_Clear();
// test PyWeakref_GetRef(NULL)
ref = Py_True; // marker to check that value was set
assert(PyWeakref_GetRef(NULL, &ref) == -1);
assert(PyErr_ExceptionMatches(PyExc_SystemError));
assert(ref == NULL);
PyErr_Clear();
// test PyWeakref_GetObject(NULL)
assert(PyWeakref_GetObject(NULL) == NULL);
assert(PyErr_ExceptionMatches(PyExc_SystemError));
PyErr_Clear();
Py_DECREF(weakref);
Py_RETURN_NONE; Py_RETURN_NONE;
} }