Skip to content

Commit ebf2c56

Browse files
authored
gh-106831: Fix NULL check of d2i_SSL_SESSION() result in _ssl.c (#106832)
1 parent 8e9a1a0 commit ebf2c56

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Fix potential missing ``NULL`` check of ``d2i_SSL_SESSION`` result in
2+
``_ssl.c``.

Modules/_ssl.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2808,7 +2808,7 @@ _ssl_session_dup(SSL_SESSION *session) {
28082808
/* get length */
28092809
slen = i2d_SSL_SESSION(session, NULL);
28102810
if (slen == 0 || slen > 0xFF00) {
2811-
PyErr_SetString(PyExc_ValueError, "i2d() failed.");
2811+
PyErr_SetString(PyExc_ValueError, "i2d() failed");
28122812
goto error;
28132813
}
28142814
if ((senc = PyMem_Malloc(slen)) == NULL) {
@@ -2817,12 +2817,13 @@ _ssl_session_dup(SSL_SESSION *session) {
28172817
}
28182818
p = senc;
28192819
if (!i2d_SSL_SESSION(session, &p)) {
2820-
PyErr_SetString(PyExc_ValueError, "i2d() failed.");
2820+
PyErr_SetString(PyExc_ValueError, "i2d() failed");
28212821
goto error;
28222822
}
28232823
const_p = senc;
28242824
newsession = d2i_SSL_SESSION(NULL, &const_p, slen);
2825-
if (session == NULL) {
2825+
if (newsession == NULL) {
2826+
PyErr_SetString(PyExc_ValueError, "d2i() failed");
28262827
goto error;
28272828
}
28282829
PyMem_Free(senc);

0 commit comments

Comments
 (0)