diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2023-07-17 20:31:10 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-17 20:31:10 (GMT) |
| commit | a782d51913222e340b75b2dd50e646be80dd035b (patch) | |
| tree | 52369ce9fe38374a78d61d2aab24f9c34749384f /Modules | |
| parent | 263d8aa017bd6d858aa9488154bc160fa7249a9e (diff) | |
| download | cpython-a782d51913222e340b75b2dd50e646be80dd035b.zip cpython-a782d51913222e340b75b2dd50e646be80dd035b.tar.gz cpython-a782d51913222e340b75b2dd50e646be80dd035b.tar.bz2 | |
[3.11] gh-106831: Fix NULL check of d2i_SSL_SESSION() result in _ssl.c (GH-106832) (#106836)
gh-106831: Fix NULL check of d2i_SSL_SESSION() result in _ssl.c (GH-106832)
(cherry picked from commit ebf2c56b33553a448da8f60fcd89a622f071b5f4)
Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index c1a8eaa..e3bb38e 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -2800,7 +2800,7 @@ _ssl_session_dup(SSL_SESSION *session) { /* get length */ slen = i2d_SSL_SESSION(session, NULL); if (slen == 0 || slen > 0xFF00) { - PyErr_SetString(PyExc_ValueError, "i2d() failed."); + PyErr_SetString(PyExc_ValueError, "i2d() failed"); goto error; } if ((senc = PyMem_Malloc(slen)) == NULL) { @@ -2809,12 +2809,13 @@ _ssl_session_dup(SSL_SESSION *session) { } p = senc; if (!i2d_SSL_SESSION(session, &p)) { - PyErr_SetString(PyExc_ValueError, "i2d() failed."); + PyErr_SetString(PyExc_ValueError, "i2d() failed"); goto error; } const_p = senc; newsession = d2i_SSL_SESSION(NULL, &const_p, slen); - if (session == NULL) { + if (newsession == NULL) { + PyErr_SetString(PyExc_ValueError, "d2i() failed"); goto error; } PyMem_Free(senc); |