From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Wed, 12 May 2021 18:45:06 +0000 (-0700)
Subject: bpo-40645: Fix ref leaks in _hashopenssl (GH-26079)
X-Git-Tag: v3.10.0b2~110
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ee58f252454072a1c9da77999db8e6417a307a0;p=thirdparty%2FPython%2Fcpython.git

bpo-40645: Fix ref leaks in _hashopenssl (GH-26079)

(cherry picked from commit 504ffdae4e0cb7775f3e584c3b1d20c262fdfd7e)

Co-authored-by: Erlend Egeberg Aasland <erlend.aasland@innova.no>
---

diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index b2c67759e95e..e4a288537756 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -2093,20 +2093,25 @@ hashlib_init_constructors(PyObject *module)
         }
         func  = PyObject_GetAttrString(module, fdef->ml_name);
         if (func == NULL) {
+            Py_DECREF(name_obj);
             return -1;
         }
-        if (PyDict_SetItem(state->constructs, func, name_obj) < 0) {
-            return -1;
-        }
+        int rc = PyDict_SetItem(state->constructs, func, name_obj);
         Py_DECREF(func);
         Py_DECREF(name_obj);
+        if (rc < 0) {
+            return -1;
+        }
     }
 
     proxy = PyDictProxy_New(state->constructs);
     if (proxy == NULL) {
         return -1;
     }
-    if (PyModule_AddObjectRef(module, "_constructors", proxy) < 0) {
+
+    int rc = PyModule_AddObjectRef(module, "_constructors", proxy);
+    Py_DECREF(proxy);
+    if (rc < 0) {
         return -1;
     }
     return 0;