gh-102192: remove redundant excption fields from ssl module socket

iritkatriel · iritkatriel · commit ca602df521af · 2023-03-06T10:23:43.000Z
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
@@ -314,9 +314,7 @@ typedef struct {
      * store exception information on the socket. The handshake, read, write,
      * and shutdown methods check for chained exceptions.
      */
-    PyObject *exc_type;
-    PyObject *exc_value;
-    PyObject *exc_tb;
+    PyObject *exc;
 } PySSLSocket;
 
 typedef struct {
@@ -560,13 +558,10 @@ fill_and_set_sslerror(_sslmodulestate *state,
 
 static int
 PySSL_ChainExceptions(PySSLSocket *sslsock) {
-    if (sslsock->exc_type == NULL)
+    if (sslsock->exc == NULL)
         return 0;
 
-    _PyErr_ChainExceptions(sslsock->exc_type, sslsock->exc_value, sslsock->exc_tb);
-    sslsock->exc_type = NULL;
-    sslsock->exc_value = NULL;
-    sslsock->exc_tb = NULL;
+    _PyErr_ChainExceptions1(sslsock->exc);
     return -1;
 }
 
@@ -803,9 +798,7 @@ newPySSLSocket(PySSLContext *sslctx, PySocketSockObject *sock,
     self->owner = NULL;
     self->server_hostname = NULL;
     self->err = err;
-    self->exc_type = NULL;
-    self->exc_value = NULL;
-    self->exc_tb = NULL;
+    self->exc = NULL;
 
     /* Make sure the SSL error state is initialized */
     ERR_clear_error();
@@ -2175,19 +2168,15 @@ Passed as \"self\" in servername callback.");
 static int
 PySSL_traverse(PySSLSocket *self, visitproc visit, void *arg)
 {
-    Py_VISIT(self->exc_type);
-    Py_VISIT(self->exc_value);
-    Py_VISIT(self->exc_tb);
+    Py_VISIT(self->exc);
     Py_VISIT(Py_TYPE(self));
     return 0;
 }
 
 static int
 PySSL_clear(PySSLSocket *self)
 {
-    Py_CLEAR(self->exc_type);
-    Py_CLEAR(self->exc_value);
-    Py_CLEAR(self->exc_tb);
+    Py_CLEAR(self->exc);
     return 0;
 }
 
@@ -2532,7 +2521,7 @@ _ssl__SSLSocket_read_impl(PySSLSocket *self, Py_ssize_t len,
         PySSL_SetError(self, retval, __FILE__, __LINE__);
         goto error;
     }
-    if (self->exc_type != NULL)
+    if (self->exc != NULL)
         goto error;
 
 done:
@@ -2658,7 +2647,7 @@ _ssl__SSLSocket_shutdown_impl(PySSLSocket *self)
         PySSL_SetError(self, ret, __FILE__, __LINE__);
         return NULL;
     }
-    if (self->exc_type != NULL)
+    if (self->exc != NULL)
         goto error;
     if (sock)
         /* It's already INCREF'ed */
diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c
@@ -74,7 +74,7 @@ _PySSL_msg_callback(int write_p, int version, int content_type,
         buf, len
     );
     if (res == NULL) {
-        PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value, &ssl_obj->exc_tb);
+        ssl_obj->exc = PyErr_GetRaisedException();
     } else {
         Py_DECREF(res);
     }
@@ -138,8 +138,7 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
         lock = PyThread_allocate_lock();
         if (lock == NULL) {
             PyErr_SetString(PyExc_MemoryError, "Unable to allocate lock");
-            PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value,
-                        &ssl_obj->exc_tb);
+            ssl_obj->exc = PyErr_GetRaisedException();
             return;
         }
     }
@@ -156,7 +155,7 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
         errno = e;
         PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError,
                                              ssl_obj->ctx->keylog_filename);
-        PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value, &ssl_obj->exc_tb);
+        ssl_obj->exc = PyErr_GetRaisedException();
     }
     PyGILState_Release(threadstate);
 }

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ _PySSL_msg_callback(int write_p, int version, int content_type,`
`74`	`74`	`buf, len`
`75`	`75`	`);`
`76`	`76`	`if (res == NULL) {`
`77`		`- PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value, &ssl_obj->exc_tb);`
	`77`	`+ ssl_obj->exc = PyErr_GetRaisedException();`
`78`	`78`	`} else {`
`79`	`79`	`Py_DECREF(res);`
`80`	`80`	`}`
`@@ -138,8 +138,7 @@ _PySSL_keylog_callback(const SSL ssl, const char line)`
`138`	`138`	`lock = PyThread_allocate_lock();`
`139`	`139`	`if (lock == NULL) {`
`140`	`140`	`PyErr_SetString(PyExc_MemoryError, "Unable to allocate lock");`
`141`		`- PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value,`
`142`		`- &ssl_obj->exc_tb);`
	`141`	`+ ssl_obj->exc = PyErr_GetRaisedException();`
`143`	`142`	`return;`
`144`	`143`	`}`
`145`	`144`	`}`
`@@ -156,7 +155,7 @@ _PySSL_keylog_callback(const SSL ssl, const char line)`
`156`	`155`	`errno = e;`
`157`	`156`	`PyErr_SetFromErrnoWithFilenameObject(PyExc_OSError,`
`158`	`157`	`ssl_obj->ctx->keylog_filename);`
`159`		`- PyErr_Fetch(&ssl_obj->exc_type, &ssl_obj->exc_value, &ssl_obj->exc_tb);`
	`158`	`+ ssl_obj->exc = PyErr_GetRaisedException();`
`160`	`159`	`}`
`161`	`160`	`PyGILState_Release(threadstate);`
`162`	`161`	`}`