bpo-36179: Fix ref leaks in _hashopenssl (GH-12158)

miss-islington · tiran · web-flow · commit a59d33a1b08b · 2019-03-04T08:17:30.000-08:00
Fix two unlikely reference leaks in _hashopenssl. The leaks only occur in out-of-memory cases. Thanks to Charalampos Stratakis. Signed-off-by: Christian Heimes <christian@python.org> https://bugs.python.org/issue36179 (cherry picked from commit b7bc283) Co-authored-by: Christian Heimes <christian@python.org>
diff --git a/Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst b/Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst
@@ -0,0 +1,2 @@
+Fix two unlikely reference leaks in _hashopenssl. The leaks only occur in
+out-of-memory cases.
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
@@ -112,17 +112,18 @@ newEVPobject(PyObject *name)
         return NULL;
     }
 
+    /* save the name for .name to return */
+    Py_INCREF(name);
+    retval->name = name;
+    retval->lock = NULL;
+
     retval->ctx = EVP_MD_CTX_new();
     if (retval->ctx == NULL) {
+        Py_DECREF(retval);
         PyErr_NoMemory();
         return NULL;
     }
 
-    /* save the name for .name to return */
-    Py_INCREF(name);
-    retval->name = name;
-    retval->lock = NULL;
-
     return retval;
 }
 
@@ -181,6 +182,7 @@ EVP_copy(EVPobject *self, PyObject *unused)
         return NULL;
 
     if (!locked_EVP_MD_CTX_copy(newobj->ctx, self)) {
+        Py_DECREF(newobj);
         return _setException(PyExc_ValueError);
     }
     return (PyObject *)newobj;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix two unlikely reference leaks in _hashopenssl. The leaks only occur in`
	`2`	`+out-of-memory cases.`