From: Sam Gross <colesbury@gmail.com>
Date: Sat, 13 Jul 2024 16:07:52 +0000 (-0400)
Subject: gh-121652: Handle `allocate_weakref` returning NULL (#121653)
X-Git-Tag: v3.14.0a1~1149
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a640a605a8a1a3f73b98f948d0c2a7d42134f692;p=thirdparty%2FPython%2Fcpython.git

gh-121652: Handle `allocate_weakref` returning NULL (#121653)

The `allocate_weakref` may return NULL when out of memory. We need to
handle that case and propagate the error.
---

diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
index 0fcd37d949b3..61f05514a480 100644
--- a/Objects/weakrefobject.c
+++ b/Objects/weakrefobject.c
@@ -426,6 +426,10 @@ get_or_create_weakref(PyTypeObject *type, PyObject *obj, PyObject *callback)
             return basic_ref;
         }
         PyWeakReference *newref = allocate_weakref(type, obj, callback);
+        if (newref == NULL) {
+            UNLOCK_WEAKREFS(obj);
+            return NULL;
+        }
         insert_weakref(newref, list);
         UNLOCK_WEAKREFS(obj);
         return newref;
@@ -433,6 +437,9 @@ get_or_create_weakref(PyTypeObject *type, PyObject *obj, PyObject *callback)
     else {
         // We may not be able to safely allocate inside the lock
         PyWeakReference *newref = allocate_weakref(type, obj, callback);
+        if (newref == NULL) {
+            return NULL;
+        }
         LOCK_WEAKREFS(obj);
         insert_weakref(newref, list);
         UNLOCK_WEAKREFS(obj);