In setup_context, replace _PyDict_GetItemWithError with PyDict_GetItemRef

erlend-aasland · erlend-aasland · commit 98e3e4ee9bf8 · 2024-03-13T22:48:49.000+01:00
diff --git a/Python/_warnings.c b/Python/_warnings.c
@@ -917,13 +917,12 @@ setup_context(Py_ssize_t stack_level,
     /* Setup registry. */
     assert(globals != NULL);
     assert(PyDict_Check(globals));
-    *registry = _PyDict_GetItemWithError(globals, &_Py_ID(__warningregistry__));
+    int rc = PyDict_GetItemRef(globals, &_Py_ID(__warningregistry__),
+                               registry);
+    if (rc < 0) {
+        goto handle_error;
+    }
     if (*registry == NULL) {
-        int rc;
-
-        if (_PyErr_Occurred(tstate)) {
-            goto handle_error;
-        }
         *registry = PyDict_New();
         if (*registry == NULL)
             goto handle_error;
@@ -932,8 +931,6 @@ setup_context(Py_ssize_t stack_level,
          if (rc < 0)
             goto handle_error;
     }
-    else
-        Py_INCREF(*registry);
 
     /* Setup module. */
     *module = _PyDict_GetItemWithError(globals, &_Py_ID(__name__));
