[3.13] gh-121652: Handle allocate_weakref returning NULL (GH-121653) (#121721)

miss-islington · colesbury · web-flow · commit f78e1aa1f0ed · 2024-07-13T16:31:50.000Z
The `allocate_weakref` may return NULL when out of memory. We need to handle that case and propagate the error. (cherry picked from commit a640a60) Co-authored-by: Sam Gross <colesbury@gmail.com>
diff --git a/Objects/weakrefobject.c b/Objects/weakrefobject.c
@@ -426,13 +426,20 @@ 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;
     }
     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);
