[Python-checkins] cpython (merge 3.5 -> default): merge 3.5 (#25569)

Thu Nov 12 01:14:46 EST 2015

https://hg.python.org/cpython/rev/fb55b1ab43fc
changeset: 99069:fb55b1ab43fc
parent: 99065:c7fbef40b62b
parent: 99068:07a298572d93
user: Benjamin Peterson <benjamin at python.org>
date: Wed Nov 11 22:14:31 2015 -0800
summary:
 merge 3.5 (#25569)
files:
 Misc/NEWS | 2 +
 Modules/_ssl.c | 54 +++++++++++++++++--------------------
 2 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -233,6 +233,8 @@
 - Issue #13248: Remove deprecated inspect.getargspec and inspect.getmoduleinfo
 functions.
 
+- Issue #25569: Fix memory leak in SSLSocket.getpeercert().
+
 - Issue #25471: Sockets returned from accept() shouldn't appear to be
 nonblocking.
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1067,25 +1067,23 @@
 static PyObject *
 _get_crl_dp(X509 *certificate) {
 STACK_OF(DIST_POINT) *dps;
- int i, j, result;
- PyObject *lst;
+ int i, j;
+ PyObject *lst, *res = NULL;
 
 #if OPENSSL_VERSION_NUMBER < 0x10001000L
- dps = X509_get_ext_d2i(certificate, NID_crl_distribution_points,
- NULL, NULL);
+ dps = X509_get_ext_d2i(certificate, NID_crl_distribution_points, NULL, NULL);
 #else
 /* Calls x509v3_cache_extensions and sets up crldp */
 X509_check_ca(certificate);
 dps = certificate->crldp;
 #endif
 
- if (dps == NULL) {
+ if (dps == NULL)
 return Py_None;
- }
-
- if ((lst = PyList_New(0)) == NULL) {
- return NULL;
- }
+
+ lst = PyList_New(0);
+ if (lst == NULL)
+ goto done;
 
 for (i=0; i < sk_DIST_POINT_num(dps); i++) {
 DIST_POINT *dp;
@@ -1098,6 +1096,7 @@
 GENERAL_NAME *gn;
 ASN1_IA5STRING *uri;
 PyObject *ouri;
+ int err;
 
 gn = sk_GENERAL_NAME_value(gns, j);
 if (gn->type != GEN_URI) {
@@ -1106,28 +1105,25 @@
 uri = gn->d.uniformResourceIdentifier;
 ouri = PyUnicode_FromStringAndSize((char *)uri->data,
 uri->length);
- if (ouri == NULL) {
- Py_DECREF(lst);
- return NULL;
- }
- result = PyList_Append(lst, ouri);
+ if (ouri == NULL)
+ goto done;
+
+ err = PyList_Append(lst, ouri);
 Py_DECREF(ouri);
- if (result < 0) {
- Py_DECREF(lst);
- return NULL;
- }
+ if (err < 0)
+ goto done;
 }
 }
- /* convert to tuple or None */
- if (PyList_Size(lst) == 0) {
- Py_DECREF(lst);
- return Py_None;
- } else {
- PyObject *tup;
- tup = PyList_AsTuple(lst);
- Py_DECREF(lst);
- return tup;
- }
+
+ /* Convert to tuple. */
+ res = (PyList_GET_SIZE(lst) > 0) ? PyList_AsTuple(lst) : Py_None;
+
+ done:
+ Py_XDECREF(lst);
+#if OPENSSL_VERSION_NUMBER < 0x10001000L
+ sk_DIST_POINT_free(dsp);
+#endif
+ return res;
 }
 
 static PyObject *
-- 
Repository URL: https://hg.python.org/cpython
