diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2020-07-09 10:00:21 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-09 10:00:21 (GMT) |
| commit | ee96f32ca24779656d3c8736d26671fc3689f0a3 (patch) | |
| tree | bd9e791d38634b225cdee142a0f746c5db8855b5 | |
| parent | a908bc4dd81f5881280f54b17aae1e7bc450efc9 (diff) | |
| download | cpython-ee96f32ca24779656d3c8736d26671fc3689f0a3.zip cpython-ee96f32ca24779656d3c8736d26671fc3689f0a3.tar.gz cpython-ee96f32ca24779656d3c8736d26671fc3689f0a3.tar.bz2 | |
bpo-41252: Fix incorrect refcounting in _ssl.c's _servername_callback() (GH-21407)
| -rw-r--r-- | Misc/NEWS.d/next/Core and Builtins/2020-07-08-21-55-23.bpo-41252.nBWL-Y.rst | 1 | ||||
| -rw-r--r-- | Modules/_ssl.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS.d/next/Core and Builtins/2020-07-08-21-55-23.bpo-41252.nBWL-Y.rst b/Misc/NEWS.d/next/Core and Builtins/2020-07-08-21-55-23.bpo-41252.nBWL-Y.rst new file mode 100644 index 0000000..65f3189 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2020-07-08-21-55-23.bpo-41252.nBWL-Y.rst @@ -0,0 +1 @@ +Fix incorrect refcounting in _ssl.c's ``_servername_callback()``. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 5806417..a8c339d 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -4545,11 +4545,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); |