diff options
author | Victor Stinner <vstinner@python.org> | 2023-06-22 20:31:31 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-22 20:31:31 (GMT) |
commit | 46a3190fcf8580f322047395408cd60feba67041 (patch) | |
tree | f7a27fae83831b5ce9109f81506e7c5e5c9757e5 /Modules | |
parent | c38da1e3e19a7bf1053c6d52e730e970efeceff6 (diff) | |
download | cpython-46a3190fcf8580f322047395408cd60feba67041.zip cpython-46a3190fcf8580f322047395408cd60feba67041.tar.gz cpython-46a3190fcf8580f322047395408cd60feba67041.tar.bz2 |
gh-105927: Avoid calling PyWeakref_GET_OBJECT() (#105997)
* Replace PyWeakref_GET_OBJECT() with _PyWeakref_GET_REF().
* _sqlite/blob.c now holds a strong reference to the blob object
while calling close_blob().
* _xidregistry_find_type() now holds a strong reference to registered
while using it.
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_sqlite/blob.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Modules/_sqlite/blob.c b/Modules/_sqlite/blob.c index 3096fb0..989d9a8 100644 --- a/Modules/_sqlite/blob.c +++ b/Modules/_sqlite/blob.c @@ -1,5 +1,10 @@ +#ifndef Py_BUILD_CORE_BUILTIN +# define Py_BUILD_CORE_MODULE 1 +#endif + #include "blob.h" #include "util.h" +#include "pycore_weakref.h" // _PyWeakref_GET_REF() #define clinic_state() (pysqlite_get_state_by_type(Py_TYPE(self))) #include "clinic/blob.c.h" @@ -97,10 +102,12 @@ pysqlite_close_all_blobs(pysqlite_Connection *self) { for (int i = 0; i < PyList_GET_SIZE(self->blobs); i++) { PyObject *weakref = PyList_GET_ITEM(self->blobs, i); - PyObject *blob = PyWeakref_GetObject(weakref); - if (!Py_IsNone(blob)) { - close_blob((pysqlite_Blob *)blob); + PyObject *blob = _PyWeakref_GET_REF(weakref); + if (blob == NULL) { + continue; } + close_blob((pysqlite_Blob *)blob); + Py_DECREF(blob); } } |