From: Antoine Pitrou Date: Wed, 15 Feb 2012 21:25:27 +0000 (+0100) Subject: Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). X-Git-Tag: v2.7.3rc1~52 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dd7e071b23e7f4b33767653b3feea0ffb2bfa6b9;p=thirdparty%2FPython%2Fcpython.git Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). --- diff --git a/Misc/NEWS b/Misc/NEWS index 474609e82bde..41b7ad2c4b55 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -93,6 +93,8 @@ Core and Builtins Library ------- +- Issue #13014: Fix a possible reference leak in SSLSocket.getpeercert(). + - Issue #13987: HTMLParser is now able to handle EOFs in the middle of a construct and malformed start tags. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index eaf67c49a9a9..e692b5dfa6a6 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -644,15 +644,20 @@ _create_tuple_for_X509_NAME (X509_NAME *xname) goto fail1; } /* now, there's typically a dangling RDN */ - if ((rdn != NULL) && (PyList_Size(rdn) > 0)) { - rdnt = PyList_AsTuple(rdn); - Py_DECREF(rdn); - if (rdnt == NULL) - goto fail0; - retcode = PyList_Append(dn, rdnt); - Py_DECREF(rdnt); - if (retcode < 0) - goto fail0; + if (rdn != NULL) { + if (PyList_GET_SIZE(rdn) > 0) { + rdnt = PyList_AsTuple(rdn); + Py_DECREF(rdn); + if (rdnt == NULL) + goto fail0; + retcode = PyList_Append(dn, rdnt); + Py_DECREF(rdnt); + if (retcode < 0) + goto fail0; + } + else { + Py_DECREF(rdn); + } } /* convert list to tuple */