diff options
| author | Christian Heimes <christian@cheimes.de> | 2012-09-20 12:42:54 +0200 |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2012-09-20 12:42:54 +0200 |
| commit | 63b38bbd1d36538dac8a21ba33117bd6800e58b4 (patch) | |
| tree | 7bc3f61d077e5f135ed2c42873bd460408c591b6 | |
| parent | f022aa502d1c3730f11a17e8534ea1ac91db4a8c (diff) | |
| download | cpython-git-63b38bbd1d36538dac8a21ba33117bd6800e58b4.tar.gz | |
Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ssl.c | 7 |
2 files changed, 10 insertions, 0 deletions
@@ -201,6 +201,9 @@ Documentation - Issue #15630: Add an example for "continue" stmt in the tutorial. Patch by Daniel Ellis. +- 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 1104a4eab7..1516b87e2e 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); |