Refactor keylog handling to use goto for cleanup

LumioseSil · web-flow · commit b2152cb61c5d · 2025-12-10T09:06:11.000-05:00
diff --git a/Modules/_ssl/debughelpers.c b/Modules/_ssl/debughelpers.c
@@ -131,8 +131,7 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
     PyThread_type_lock lock = get_state_sock(ssl_obj)->keylog_lock;
     assert(lock != NULL);
     if (ssl_obj->ctx->keylog_bio == NULL) {
-        PyGILState_Release(threadstate);
-        return;
+        goto done;
     }
     /*
      * The lock is neither released on exit nor on fork(). The lock is
@@ -156,6 +155,7 @@ _PySSL_keylog_callback(const SSL *ssl, const char *line)
                                              ssl_obj->ctx->keylog_filename);
         ssl_obj->exc = PyErr_GetRaisedException();
     }
+done:
     PyGILState_Release(threadstate);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -131,8 +131,7 @@ _PySSL_keylog_callback(const SSL ssl, const char line)`
`131`	`131`	`PyThread_type_lock lock = get_state_sock(ssl_obj)->keylog_lock;`
`132`	`132`	`assert(lock != NULL);`
`133`	`133`	`if (ssl_obj->ctx->keylog_bio == NULL) {`
`134`		`- PyGILState_Release(threadstate);`
`135`		`- return;`
	`134`	`+ goto done;`
`136`	`135`	`}`
`137`	`136`	`/*`
`138`	`137`	`* The lock is neither released on exit nor on fork(). The lock is`
`@@ -156,6 +155,7 @@ _PySSL_keylog_callback(const SSL ssl, const char line)`
`156`	`155`	`ssl_obj->ctx->keylog_filename);`
`157`	`156`	`ssl_obj->exc = PyErr_GetRaisedException();`
`158`	`157`	`}`
	`158`	`+done:`
`159`	`159`	`PyGILState_Release(threadstate);`
`160`	`160`	`}`
`161`	`161`