gh-111789: Use PyDict_GetItemRef() in Python/_warnings.c (gh-112080)

serhiy-storchaka · web-flow · commit 936c503a442e · 2023-11-27T18:58:43.000+01:00
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -425,15 +425,15 @@ already_warned(PyInterpreterState *interp, PyObject *registry, PyObject *key,
         Py_DECREF(version_obj);
     }
     else {
-        already_warned = PyDict_GetItemWithError(registry, key);
+        if (PyDict_GetItemRef(registry, key, &already_warned) < 0) {
+            return -1;
+        }
         if (already_warned != NULL) {
             int rc = PyObject_IsTrue(already_warned);
+            Py_DECREF(already_warned);
             if (rc != 0)
                 return rc;
         }
-        else if (PyErr_Occurred()) {
-            return -1;
-        }
     }
 
     /* This warning wasn't found in the registry, set it. */

Original file line number	Diff line number	Diff line change
`@@ -425,15 +425,15 @@ already_warned(PyInterpreterState interp, PyObject registry, PyObject *key,`
`425`	`425`	`Py_DECREF(version_obj);`
`426`	`426`	`}`
`427`	`427`	`else {`
`428`		`- already_warned = PyDict_GetItemWithError(registry, key);`
	`428`	`+ if (PyDict_GetItemRef(registry, key, &already_warned) < 0) {`
	`429`	`+ return -1;`
	`430`	`+ }`
`429`	`431`	`if (already_warned != NULL) {`
`430`	`432`	`int rc = PyObject_IsTrue(already_warned);`
	`433`	`+ Py_DECREF(already_warned);`
`431`	`434`	`if (rc != 0)`
`432`	`435`	`return rc;`
`433`	`436`	`}`
`434`		`- else if (PyErr_Occurred()) {`
`435`		`- return -1;`
`436`		`- }`
`437`	`437`	`}`
`438`	`438`
`439`	`439`	`/* This warning wasn't found in the registry, set it. */`