[3.12] gh-106831: Fix NULL check of d2i_SSL_SESSION() result in _ssl.c (GH-106832) (#106835)

miss-islington · sobolevn · web-flow · commit 2eef81e05ece · 2023-07-17T20:40:15.000Z
gh-106831: Fix NULL check of d2i_SSL_SESSION() result in _ssl.c (GH-106832) (cherry picked from commit ebf2c56) Co-authored-by: Nikita Sobolev <mail@sobolevn.me>
diff --git a/Misc/NEWS.d/next/Library/2023-07-17-21-45-15.gh-issue-106831.RqVq9X.rst b/Misc/NEWS.d/next/Library/2023-07-17-21-45-15.gh-issue-106831.RqVq9X.rst
@@ -0,0 +1,2 @@
+Fix potential missing ``NULL`` check of ``d2i_SSL_SESSION`` result in
+``_ssl.c``.
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -2779,7 +2779,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) {
@@ -2788,12 +2788,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);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+Fix potential missing ``NULL`` check of ``d2i_SSL_SESSION`` result in
	`2`	+``_ssl.c``.
Original file line number	Diff line number	Diff line change
`@@ -2779,7 +2779,7 @@ _ssl_session_dup(SSL_SESSION *session) {`
`2779`	`2779`	`/* get length */`
`2780`	`2780`	`slen = i2d_SSL_SESSION(session, NULL);`
`2781`	`2781`	`if (slen == 0 \|\| slen > 0xFF00) {`
`2782`		`- PyErr_SetString(PyExc_ValueError, "i2d() failed.");`
	`2782`	`+ PyErr_SetString(PyExc_ValueError, "i2d() failed");`
`2783`	`2783`	`goto error;`
`2784`	`2784`	`}`
`2785`	`2785`	`if ((senc = PyMem_Malloc(slen)) == NULL) {`
`@@ -2788,12 +2788,13 @@ _ssl_session_dup(SSL_SESSION *session) {`
`2788`	`2788`	`}`
`2789`	`2789`	`p = senc;`
`2790`	`2790`	`if (!i2d_SSL_SESSION(session, &p)) {`
`2791`		`- PyErr_SetString(PyExc_ValueError, "i2d() failed.");`
	`2791`	`+ PyErr_SetString(PyExc_ValueError, "i2d() failed");`
`2792`	`2792`	`goto error;`
`2793`	`2793`	`}`
`2794`	`2794`	`const_p = senc;`
`2795`	`2795`	`newsession = d2i_SSL_SESSION(NULL, &const_p, slen);`
`2796`		`- if (session == NULL) {`
	`2796`	`+ if (newsession == NULL) {`
	`2797`	`+ PyErr_SetString(PyExc_ValueError, "d2i() failed");`
`2797`	`2798`	`goto error;`
`2798`	`2799`	`}`
`2799`	`2800`	`PyMem_Free(senc);`