diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-06-21 19:11:29 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-21 19:11:29 (GMT) |
| commit | 10bf6e482328f622f4b2659e4ad5e3d88f57ba58 (patch) | |
| tree | cf169ea2e78b4fe12e9da293cbee08c523f22716 /Modules/_ssl | |
| parent | a4c09560eaa1e3b9733c7e63d570b6fa7626724c (diff) | |
| download | cpython-10bf6e482328f622f4b2659e4ad5e3d88f57ba58.zip cpython-10bf6e482328f622f4b2659e4ad5e3d88f57ba58.tar.gz cpython-10bf6e482328f622f4b2659e4ad5e3d88f57ba58.tar.bz2 | |
bpo-41056: Fix a NULL pointer dereference on MemoryError within the ssl module. (GH-21009)
Detected by Coverity.
(cherry picked from commit eb0d5c38de7f970d8cd8524f4163d831c7720f51)
Co-authored-by: Gregory P. Smith <greg@krypto.org>
Diffstat (limited to 'Modules/_ssl')
| -rw-r--r-- | Modules/_ssl/debughelpers.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c index 858b3d7..b840da2 100644 --- a/Modules/_ssl/debughelpers.c +++ b/Modules/_ssl/debughelpers.c @@ -125,6 +125,12 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line) threadstate = PyGILState_Ensure(); + ssl_obj = (PySSLSocket *)SSL_get_app_data(ssl); + assert(PySSLSocket_Check(ssl_obj)); + if (ssl_obj->ctx->keylog_bio == NULL) { + return; + } + /* Allocate a static lock to synchronize writes to keylog file. * The lock is neither released on exit nor on fork(). The lock is * also shared between all SSLContexts although contexts may write to @@ -141,12 +147,6 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line) } } - ssl_obj = (PySSLSocket *)SSL_get_app_data(ssl); - assert(PySSLSocket_Check(ssl_obj)); - if (ssl_obj->ctx->keylog_bio == NULL) { - return; - } - PySSL_BEGIN_ALLOW_THREADS PyThread_acquire_lock(lock, 1); res = BIO_printf(ssl_obj->ctx->keylog_bio, "%s\n", line); |