summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2019-03-04 08:17:30 -0800
committerGitHub <noreply@github.com>2019-03-04 08:17:30 -0800
commita59d33a1b08bd3dc9dc2584d4360ca81b0f1ad49 (patch)
tree7e159bbf4f20ceb2d043b5f00b1cdce825d5661c /Modules
parent06e9953d5e3f0144ec8247b61541e7be85d55b50 (diff)
downloadcpython-git-a59d33a1b08bd3dc9dc2584d4360ca81b0f1ad49.tar.gz
bpo-36179: Fix ref leaks in _hashopenssl (GH-12158)
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 b7bc283ab6a23ee98784400ebffe7fe410232a2e) Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_hashopenssl.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 31d05409f2..b1f0d397aa 100644
--- 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;