From: Hirokazu Yamamoto Date: Tue, 3 Mar 2009 22:05:57 +0000 (+0000) Subject: Fixed memory leak. X-Git-Tag: v2.7a1~1907 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8355155f2298ed5d45ae5381edaf953fceb06b14;p=thirdparty%2FPython%2Fcpython.git Fixed memory leak. --- diff --git a/Modules/sha256module.c b/Modules/sha256module.c index e10ab9ecc504..f489f48893b4 100644 --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -629,13 +629,18 @@ SHA256_new(PyObject *self, PyObject *args, PyObject *kwdict) if (data_obj) GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL); - if ((new = newSHA256object()) == NULL) + if ((new = newSHA256object()) == NULL) { + if (data_obj) + PyBuffer_Release(&buf); return NULL; + } sha_init(new); if (PyErr_Occurred()) { Py_DECREF(new); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } if (data_obj) { @@ -665,13 +670,18 @@ SHA224_new(PyObject *self, PyObject *args, PyObject *kwdict) if (data_obj) GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL); - if ((new = newSHA224object()) == NULL) + if ((new = newSHA224object()) == NULL) { + if (data_obj) + PyBuffer_Release(&buf); return NULL; + } sha224_init(new); if (PyErr_Occurred()) { Py_DECREF(new); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } if (data_obj) { diff --git a/Modules/sha512module.c b/Modules/sha512module.c index 5e606cb89f47..24812752f84b 100644 --- a/Modules/sha512module.c +++ b/Modules/sha512module.c @@ -695,13 +695,18 @@ SHA512_new(PyObject *self, PyObject *args, PyObject *kwdict) if (data_obj) GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL); - if ((new = newSHA512object()) == NULL) + if ((new = newSHA512object()) == NULL) { + if (data_obj) + PyBuffer_Release(&buf); return NULL; + } sha512_init(new); if (PyErr_Occurred()) { Py_DECREF(new); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } if (data_obj) { @@ -731,13 +736,18 @@ SHA384_new(PyObject *self, PyObject *args, PyObject *kwdict) if (data_obj) GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf, NULL); - if ((new = newSHA384object()) == NULL) + if ((new = newSHA384object()) == NULL) { + if (data_obj) + PyBuffer_Release(&buf); return NULL; + } sha384_init(new); if (PyErr_Occurred()) { Py_DECREF(new); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } if (data_obj) {