traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Christian Heimes 2012-09-20 12:42:54 +02:00
parent 4a5fae1b79
commit 5cb31c9277
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -68,6 +68,9 @@ Library
Extension Modules 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 Tests
----- -----

7
Modules/_ssl.c
View File

@ -1713,6 +1713,9 @@ context_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
self->ctx = ctx; self->ctx = ctx;
#ifdef OPENSSL_NPN_NEGOTIATED
self->npn_protocols = NULL;
#endif
/* Defaults */ /* Defaults */
SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL); SSL_CTX_set_verify(self->ctx, SSL_VERIFY_NONE, NULL);
SSL_CTX_set_options(self->ctx, 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)) if (!PyArg_ParseTuple(args, "y*:set_npn_protocols", &protos))
return NULL; return NULL;
if (self->npn_protocols != NULL) {
PyMem_Free(self->npn_protocols);
}
self->npn_protocols = PyMem_Malloc(protos.len); self->npn_protocols = PyMem_Malloc(protos.len);
if (self->npn_protocols == NULL) { if (self->npn_protocols == NULL) {
PyBuffer_Release(&protos); PyBuffer_Release(&protos);