diff options
| author | Erlend E. Aasland <erlend.aasland@protonmail.com> | 2023-06-11 19:46:19 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-11 19:46:19 (GMT) |
| commit | e8998e46a7ce8ad336e0941a6da6e50cb88d1e47 (patch) | |
| tree | ad931319b319d055133300de286ef6debfb4786d | |
| parent | 555be81026fe1205d16c02f6321221381174cd07 (diff) | |
| download | cpython-e8998e46a7ce8ad336e0941a6da6e50cb88d1e47.zip cpython-e8998e46a7ce8ad336e0941a6da6e50cb88d1e47.tar.gz cpython-e8998e46a7ce8ad336e0941a6da6e50cb88d1e47.tar.bz2 | |
gh-105375: Improve error handling in _ctypes (#105593)
Prevent repeated PyLong_FromVoidPtr() from possibly overwriting the
current exception.
| -rw-r--r-- | Misc/NEWS.d/next/Library/2023-06-09-21-40-45.gh-issue-105375._sZilh.rst | 1 | ||||
| -rw-r--r-- | Modules/_ctypes/callbacks.c | 18 |
2 files changed, 15 insertions, 4 deletions
diff --git a/Misc/NEWS.d/next/Library/2023-06-09-21-40-45.gh-issue-105375._sZilh.rst b/Misc/NEWS.d/next/Library/2023-06-09-21-40-45.gh-issue-105375._sZilh.rst new file mode 100644 index 0000000..87db4c2 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2023-06-09-21-40-45.gh-issue-105375._sZilh.rst @@ -0,0 +1 @@ +Fix bugs in :mod:`_ctypes` where exceptions could end up being overwritten. diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 8e694ba..d71297f 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -479,12 +479,22 @@ long Call_GetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv) { PyObject *py_rclsid = PyLong_FromVoidPtr((void *)rclsid); + if (py_rclsid == NULL) { + Py_DECREF(func); + PyErr_WriteUnraisable(context ? context : Py_None); + return E_FAIL; + } PyObject *py_riid = PyLong_FromVoidPtr((void *)riid); + if (py_riid == NULL) { + Py_DECREF(func); + Py_DECREF(py_rclsid); + PyErr_WriteUnraisable(context ? context : Py_None); + return E_FAIL; + } PyObject *py_ppv = PyLong_FromVoidPtr(ppv); - if (!py_rclsid || !py_riid || !py_ppv) { - Py_XDECREF(py_rclsid); - Py_XDECREF(py_riid); - Py_XDECREF(py_ppv); + if (py_ppv == NULL) { + Py_DECREF(py_rclsid); + Py_DECREF(py_riid); Py_DECREF(func); PyErr_WriteUnraisable(context ? context : Py_None); return E_FAIL; |