From b7bc283ab6a23ee98784400ebffe7fe410232a2e Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 4 Mar 2019 16:45:41 +0100 Subject: 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 https://bugs.python.org/issue36179 --- .../next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst | 2 ++ Modules/_hashopenssl.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 Misc/NEWS.d/next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst 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 new file mode 100644 index 0000000..61a9877 --- /dev/null +++ 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 index 9091025..aae558c 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -109,17 +109,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; } @@ -182,6 +183,7 @@ EVP_copy_impl(EVPobject *self) return NULL; if (!locked_EVP_MD_CTX_copy(newobj->ctx, self)) { + Py_DECREF(newobj); return _setException(PyExc_ValueError); } return (PyObject *)newobj; -- cgit v0.12