From: Christian Heimes <christian@cheimes.de>
Date: Thu, 20 Sep 2012 10:42:54 +0000 (+0200)
Subject: Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols... 
X-Git-Tag: v3.3.1rc1~818^2^2~69
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cb31c9277500745b443dacf183fd16c7704577b;p=python

Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times
---

diff --git a/Misc/NEWS b/Misc/NEWS
index 990f4d6c92..63434ba81e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -68,6 +68,9 @@ Library
 Extension Modules
 -----------------
 
+- Issue #15977: Fix memory leak in Modules/_ssl.c when the function
+  _set_npn_protocols() is called multiple times, thanks to Daniel Sommermann.
+
 Tests
 -----
 
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 456b1f1ead..ad22c5299c 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -1713,6 +1713,9 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     }
     self->ctx = ctx;
+#ifdef OPENSSL_NPN_NEGOTIATED
+    self->npn_protocols = NULL;
+#endif
     /* Defaults */
     SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL);
     SSL_CTX_set_options(self->ctx,
@@ -1812,6 +1815,10 @@ _set_npn_protocols(PySSLContext *self, PyObject *args)
     if (!PyArg_ParseTuple(args, "y*:set_npn_protocols", &protos))
         return NULL;
 
+    if (self->npn_protocols != NULL) {
+        PyMem_Free(self->npn_protocols);
+    }
+
     self->npn_protocols = PyMem_Malloc(protos.len);
     if (self->npn_protocols == NULL) {
         PyBuffer_Release(&protos);