diff options
author | Erlend E. Aasland <erlend.aasland@protonmail.com> | 2023-06-11 19:25:36 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-11 19:25:36 (GMT) |
commit | 87e493b11a6791777303ba6eda4027df99b7ffcb (patch) | |
tree | 40a9a0c9ac9b7d4f2b51ab9b6ca35cc5bf627c47 | |
parent | f207b346d4ce4d4cd896e63e246ef4d18323ebeb (diff) | |
download | cpython-87e493b11a6791777303ba6eda4027df99b7ffcb.zip cpython-87e493b11a6791777303ba6eda4027df99b7ffcb.tar.gz cpython-87e493b11a6791777303ba6eda4027df99b7ffcb.tar.bz2 |
[3.11] gh-105375: Harden _ssl initialisation (#105599) (#105651)
(cherry picked from commit 01f4230460454d4a849a5ba93320142c1a0c93a8)
Add proper error handling to prevent reference leaks and overwritten
exceptions.
Co-authored-by: Erlend E. Aasland <erlend.aasland@protonmail.com>
-rw-r--r-- | Misc/NEWS.d/next/Library/2023-06-09-22-16-46.gh-issue-105375.EgVJOP.rst | 2 | ||||
-rw-r--r-- | Modules/_ssl.c | 21 |
2 files changed, 17 insertions, 6 deletions
diff --git a/Misc/NEWS.d/next/Library/2023-06-09-22-16-46.gh-issue-105375.EgVJOP.rst b/Misc/NEWS.d/next/Library/2023-06-09-22-16-46.gh-issue-105375.EgVJOP.rst new file mode 100644 index 0000000..49f7df6 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-06-09-22-16-46.gh-issue-105375.EgVJOP.rst @@ -0,0 +1,2 @@ +Fix bugs in :mod:`!_ssl` initialisation which could lead to leaked +references and overwritten exceptions. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 1a41024..c1a8eaa 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -6052,17 +6052,26 @@ sslmodule_init_errorcodes(PyObject *module) errcode = error_codes; while (errcode->mnemonic != NULL) { - PyObject *mnemo, *key; - mnemo = PyUnicode_FromString(errcode->mnemonic); - key = Py_BuildValue("ii", errcode->library, errcode->reason); - if (mnemo == NULL || key == NULL) + PyObject *mnemo = PyUnicode_FromString(errcode->mnemonic); + if (mnemo == NULL) { return -1; - if (PyDict_SetItem(state->err_codes_to_names, key, mnemo)) + } + PyObject *key = Py_BuildValue("ii", errcode->library, errcode->reason); + if (key == NULL) { + Py_DECREF(mnemo); return -1; - if (PyDict_SetItem(state->err_names_to_codes, mnemo, key)) + } + if (PyDict_SetItem(state->err_codes_to_names, key, mnemo) < 0) { + Py_DECREF(key); + Py_DECREF(mnemo); return -1; + } + int rc = PyDict_SetItem(state->err_names_to_codes, mnemo, key); Py_DECREF(key); Py_DECREF(mnemo); + if (rc < 0) { + return -1; + } errcode++; } |