Skip to content

Commit 90584c0

Browse files
bpo-41252: Fix incorrect refcounting in _ssl.c's _servername_callback() (GH-21407)
(cherry picked from commit ee96f32) Co-authored-by: Zackery Spytz <[email protected]>
1 parent e689789 commit 90584c0

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Fix incorrect refcounting in _ssl.c's ``_servername_callback()``.

Modules/_ssl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4545,11 +4545,12 @@ _servername_callback(SSL *s, int *al, void *args)
45454545
* back into a str object, but still as an A-label (bpo-28414)
45464546
*/
45474547
servername_str = PyUnicode_FromEncodedObject(servername_bytes, "ascii", NULL);
4548-
Py_DECREF(servername_bytes);
45494548
if (servername_str == NULL) {
45504549
PyErr_WriteUnraisable(servername_bytes);
4550+
Py_DECREF(servername_bytes);
45514551
goto error;
45524552
}
4553+
Py_DECREF(servername_bytes);
45534554
result = PyObject_CallFunctionObjArgs(
45544555
ssl_ctx->set_sni_cb, ssl_socket, servername_str,
45554556
ssl_ctx, NULL);

0 commit comments

Comments
 (0)