bpo-41252: Fix incorrect refcounting in _ssl.c's _servername_callback() (GH-21407)

(cherry picked from commit ee96f32ca2)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>
This commit is contained in:
Miss Islington (bot) 2020-07-09 03:15:36 -07:00 committed by GitHub
parent c1c5034593
commit 54babbe976
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

View File

@ -0,0 +1 @@
Fix incorrect refcounting in _ssl.c's ``_servername_callback()``.

View File

@ -4548,11 +4548,12 @@ _servername_callback(SSL *s, int *al, void *args)
* back into a str object, but still as an A-label (bpo-28414)
*/
servername_str = PyUnicode_FromEncodedObject(servername_bytes, "ascii", NULL);
Py_DECREF(servername_bytes);
if (servername_str == NULL) {
PyErr_WriteUnraisable(servername_bytes);
Py_DECREF(servername_bytes);
goto error;
}
Py_DECREF(servername_bytes);
result = PyObject_CallFunctionObjArgs(
ssl_ctx->set_sni_cb, ssl_socket, servername_str,
ssl_ctx, NULL);