From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 27 Nov 2023 17:52:54 +0000 (+0200)
Subject: gh-111789: Use PyDict_GetItemRef() in Python/bltinmodule.c (gh-112081)
X-Git-Tag: v3.13.0a3~623
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=395fd9c1808fa0babc96540744d2c915178a452b;p=thirdparty%2FPython%2Fcpython.git

gh-111789: Use PyDict_GetItemRef() in Python/bltinmodule.c (gh-112081)
---

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index ff07c498263c..7a9625134761 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -5,7 +5,6 @@
 #include "pycore_call.h"          // _PyObject_CallNoArgs()
 #include "pycore_ceval.h"         // _PyEval_Vector()
 #include "pycore_compile.h"       // _PyAST_Compile()
-#include "pycore_dict.h"          // _PyDict_GetItemWithError()
 #include "pycore_long.h"          // _PyLong_CompactValue
 #include "pycore_modsupport.h"    // _PyArg_NoKwnames()
 #include "pycore_object.h"        // _Py_AddToAllObjects()
@@ -141,18 +140,16 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
             goto error;
         }
 
-        meta = _PyDict_GetItemWithError(mkw, &_Py_ID(metaclass));
+        if (PyDict_GetItemRef(mkw, &_Py_ID(metaclass), &meta) < 0) {
+            goto error;
+        }
         if (meta != NULL) {
-            Py_INCREF(meta);
             if (PyDict_DelItem(mkw, &_Py_ID(metaclass)) < 0) {
                 goto error;
             }
             /* metaclass is explicitly given, check if it's indeed a class */
             isclass = PyType_Check(meta);
         }
-        else if (PyErr_Occurred()) {
-            goto error;
-        }
     }
     if (meta == NULL) {
         /* if there are no bases, use type: */