76 lines
2.3 KiB
Diff
76 lines
2.3 KiB
Diff
From 84b5ac9ba6fd71ba9d0ef98e2a166a35189b263f Mon Sep 17 00:00:00 2001
|
|
From: Christian Heimes <christian@python.org>
|
|
Date: Mon, 4 Mar 2019 18:10:45 +0100
|
|
Subject: [PATCH 350/362] [2.7] bpo-36179: Fix ref leaks in _hashopenssl
|
|
(GH-12158) (GH-12166)
|
|
|
|
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>
|
|
|
|
|
|
|
|
https://bugs.python.org/issue36179
|
|
---
|
|
.../next/Library/2019-03-04-10-42-46.bpo-36179.jEyuI-.rst | 2 ++
|
|
Modules/_hashopenssl.c | 14 ++++++++------
|
|
2 files changed, 10 insertions(+), 6 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 de69f6f..78445eb 100644
|
|
--- a/Modules/_hashopenssl.c
|
|
+++ b/Modules/_hashopenssl.c
|
|
@@ -133,12 +133,6 @@ newEVPobject(PyObject *name)
|
|
if (retval == NULL)
|
|
return NULL;
|
|
|
|
- retval->ctx = EVP_MD_CTX_new();
|
|
- if (retval->ctx == NULL) {
|
|
- PyErr_NoMemory();
|
|
- return NULL;
|
|
- }
|
|
-
|
|
/* save the name for .name to return */
|
|
Py_INCREF(name);
|
|
retval->name = name;
|
|
@@ -146,6 +140,13 @@ newEVPobject(PyObject *name)
|
|
retval->lock = NULL;
|
|
#endif
|
|
|
|
+ retval->ctx = EVP_MD_CTX_new();
|
|
+ if (retval->ctx == NULL) {
|
|
+ Py_DECREF(retval);
|
|
+ PyErr_NoMemory();
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
return retval;
|
|
}
|
|
|
|
@@ -205,6 +206,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;
|
|
--
|
|
1.8.3.1
|
|
|