mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 00:23:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

gh-105927: Avoid calling PyWeakref_GET_OBJECT() (#105997)

Browse source 
* 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.
This commit is contained in:
Victor Stinner 2023-06-22 22:31:31 +02:00 • committed by GitHub
parent c38da1e3e1
commit 46a3190fcf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/_sqlite/blob.c
View file

@ -1,5 +1,10 @@
#ifndef Py_BUILD_CORE_BUILTIN
# define Py_BUILD_CORE_MODULE 1
#endif
#include "blob.h" #include "blob.h"
#include "util.h" #include "util.h"
#include "pycore_weakref.h" // _PyWeakref_GET_REF()
#define clinic_state() (pysqlite_get_state_by_type(Py_TYPE(self))) #define clinic_state() (pysqlite_get_state_by_type(Py_TYPE(self)))
#include "clinic/blob.c.h" #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++) { for (int i = 0; i < PyList_GET_SIZE(self->blobs); i++) {
PyObject *weakref = PyList_GET_ITEM(self->blobs, i); PyObject *weakref = PyList_GET_ITEM(self->blobs, i);
PyObject *blob = PyWeakref_GetObject(weakref); PyObject *blob = _PyWeakref_GET_REF(weakref);
if (!Py_IsNone(blob)) { if (blob == NULL) {
close_blob((pysqlite_Blob *)blob); continue;
} }
close_blob((pysqlite_Blob *)blob);
Py_DECREF(blob);
} }
} }

6
Objects/weakrefobject.c
View file

@ -140,7 +140,11 @@ weakref_vectorcall(PyObject *self, PyObject *const *args,
if (!_PyArg_CheckPositional("weakref", nargs, 0, 0)) { if (!_PyArg_CheckPositional("weakref", nargs, 0, 0)) {
return NULL; return NULL;
} }
return Py_NewRef(PyWeakref_GET_OBJECT(self)); PyObject *obj = _PyWeakref_GET_REF(self);
if (obj == NULL) {
Py_RETURN_NONE;
}
return obj;
} }
static Py_hash_t static Py_hash_t

9
Python/pystate.c
View file

@ -13,7 +13,8 @@
#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator() #include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_pystate.h" #include "pycore_pystate.h"
#include "pycore_runtime_init.h" // _PyRuntimeState_INIT #include "pycore_runtime_init.h" // _PyRuntimeState_INIT
#include "pycore_sysmodule.h" #include "pycore_sysmodule.h" // _PySys_Audit()
#include "pycore_weakref.h" // _PyWeakref_GET_REF()
/* -------------------------------------------------------------------------- /* --------------------------------------------------------------------------
CAUTION CAUTION
@ -2589,16 +2590,18 @@ _xidregistry_find_type(struct _xidregistry *xidregistry, PyTypeObject *cls)
{ {
struct _xidregitem *cur = xidregistry->head; struct _xidregitem *cur = xidregistry->head;
while (cur != NULL) { while (cur != NULL) {
PyObject *registered = PyWeakref_GetObject(cur->cls); PyObject *registered = _PyWeakref_GET_REF(cur->cls);
if (registered == Py_None) { if (registered == NULL) {
// The weakly ref'ed object was freed. // The weakly ref'ed object was freed.
cur = _xidregistry_remove_entry(xidregistry, cur); cur = _xidregistry_remove_entry(xidregistry, cur);
} }
else { else {
assert(PyType_Check(registered)); assert(PyType_Check(registered));
if (registered == (PyObject *)cls) { if (registered == (PyObject *)cls) {
Py_DECREF(registered);
return cur; return cur;
} }
Py_DECREF(registered);
cur = cur->next; cur = cur->next;
} }
} }