FIX: guard second usage of PyWeakref_GetObject

tacaswell · tacaswell · commit 21bb17d36194 · 2026-01-28T17:32:54.000-05:00
This function was deprecated in 3.13 and will be removed in 3.15.  There
are two usages in pycurl, one in easy.c was already correctly guarded, the
other in share.c was not.
diff --git a/src/share.c b/src/share.c
@@ -262,9 +262,19 @@ share_cleanup_and_count_live_easies(CurlShareObject *self)
 
         if (it && to_remove) {
             PyObject *wr;
+            PyObject *obj = NULL;
 
             while ((wr = PyIter_Next(it))) {
-                PyObject *obj = PyWeakref_GetObject(wr);
+#if PY_VERSION_HEX >= 0x030D0000  /* Python 3.13+ */
+                int rc = PyWeakref_GetRef(wr, &obj);
+                if (rc < 0) {
+                // NOT CORRECTLY HANDLING THIS
+                }
+
+#else
+                obj = PyWeakref_GetObject(wr);
+                Py_INCREF(obj);
+#endif
                 if (obj != Py_None) {
                     CurlObject *easy = (CurlObject *)obj;
 
@@ -285,6 +295,7 @@ share_cleanup_and_count_live_easies(CurlShareObject *self)
                 }
 
                 Py_DECREF(wr);
+                Py_DECREF(obj);
             }
 
             Py_ssize_t i, n = PyList_GET_SIZE(to_remove);
