diff options
| author | Christian Heimes <christian@cheimes.de> | 2012-09-20 10:42:54 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2012-09-20 10:42:54 (GMT) |
| commit | 5cb31c9277500745b443dacf183fd16c7704577b (patch) | |
| tree | 52246728468ba88be790a2a7253e61b28f237914 /Modules | |
| parent | 4a5fae1b794846faa02bbdd7c67272db290d2e66 (diff) | |
| download | cpython-5cb31c9277500745b443dacf183fd16c7704577b.zip cpython-5cb31c9277500745b443dacf183fd16c7704577b.tar.gz cpython-5cb31c9277500745b443dacf183fd16c7704577b.tar.bz2 | |
Issue #15977: Fix memory leak in Modules/_ssl.c when the function _set_npn_protocols() is called multiple times
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 456b1f1..ad22c52 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); |