From d958cc960f8262c5ec8ec7993d966aa19e4dbe3e Mon Sep 17 00:00:00 2001 From: Amaury Forgeot d'Arc Date: Fri, 29 Jun 2012 01:42:46 +0200 Subject: [PATCH] Issue #15219: Fix a reference leak when hashlib.new() is called with invalid parameters. --- Lib/test/test_hashlib.py | 8 ++------ Misc/NEWS | 3 +++ Modules/_hashopenssl.c | 1 + 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_hashlib.py b/Lib/test/test_hashlib.py index 855ecbfb4e4..95bf0b347c5 100644 --- a/Lib/test/test_hashlib.py +++ b/Lib/test/test_hashlib.py @@ -108,12 +108,8 @@ class HashLibTestCase(unittest.TestCase): _algo.islower()])) def test_unknown_hash(self): - try: - hashlib.new('spam spam spam spam spam') - except ValueError: - pass - else: - self.assertTrue(0 == "hashlib didn't reject bogus hash name") + self.assertRaises(ValueError, hashlib.new, 'spam spam spam spam spam') + self.assertRaises(TypeError, hashlib.new, 1) def test_get_builtin_constructor(self): get_builtin_constructor = hashlib.__dict__[ diff --git a/Misc/NEWS b/Misc/NEWS index aa41678e73a..09ea7e3b9db 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -75,6 +75,9 @@ Core and Builtins Library ------- +- Issue #15219: Fix a reference leak when hashlib.new() is called with + invalid parameters. + - Issue #9559: If messages were only added, a new file is no longer created and renamed over the old file when flush() is called on an mbox, MMDF or Babyl mailbox. diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c index aa9dd4e775f..7f016d4bdcb 100644 --- a/Modules/_hashopenssl.c +++ b/Modules/_hashopenssl.c @@ -477,6 +477,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) } if (!PyArg_Parse(name_obj, "s", &name)) { + PyBuffer_Release(&view); PyErr_SetString(PyExc_TypeError, "name must be a string"); return NULL; }