diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2025-02-25 22:50:26 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-02-25 22:50:26 (GMT) |
| commit | 7c1b76fce8c8df00da38830f72dbdde6881a33be (patch) | |
| tree | 9cd84f09c2434b7f89feb631dd6be134096d8550 /Python/traceback.c | |
| parent | b0d3f4919579cb02c46918f47ea4faa2e5d304fc (diff) | |
| download | cpython-7c1b76fce8c8df00da38830f72dbdde6881a33be.zip cpython-7c1b76fce8c8df00da38830f72dbdde6881a33be.tar.gz cpython-7c1b76fce8c8df00da38830f72dbdde6881a33be.tar.bz2 | |
[3.13] gh-130163: Fix crashes related to PySys_GetObject() (GH-130503) (GH-130556)
The use of PySys_GetObject() and _PySys_GetAttr(), which return a borrowed
reference, has been replaced by using one of the following functions, which
return a strong reference and distinguish a missing attribute from an error:
_PySys_GetOptionalAttr(), _PySys_GetOptionalAttrString(),
_PySys_GetRequiredAttr(), and _PySys_GetRequiredAttrString().
(cherry picked from commit 0ef4ffeefd1737c18dc9326133c7894d58108c2e)
Diffstat (limited to 'Python/traceback.c')
| -rw-r--r-- | Python/traceback.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/Python/traceback.c b/Python/traceback.c index e819909..f8195c9 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -12,7 +12,7 @@ #include "pycore_pyarena.h" // _PyArena_Free() #include "pycore_pyerrors.h" // _PyErr_GetRaisedException() #include "pycore_pystate.h" // _PyThreadState_GET() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_GetOptionalAttr() #include "pycore_traceback.h" // EXCEPTION_TB_HEADER #include "frameobject.h" // PyFrame_New() @@ -346,9 +346,13 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * taillen = strlen(tail); PyThreadState *tstate = _PyThreadState_GET(); - syspath = _PySys_GetAttr(tstate, &_Py_ID(path)); - if (syspath == NULL || !PyList_Check(syspath)) + if (_PySys_GetOptionalAttr(&_Py_ID(path), &syspath) < 0) { + PyErr_Clear(); + goto error; + } + if (syspath == NULL || !PyList_Check(syspath)) { goto error; + } npath = PyList_Size(syspath); open = PyObject_GetAttr(io, &_Py_ID(open)); @@ -391,6 +395,7 @@ error: result = NULL; finally: Py_XDECREF(open); + Py_XDECREF(syspath); Py_DECREF(filebytes); return result; } @@ -719,17 +724,21 @@ _PyTraceBack_Print(PyObject *v, const char *header, PyObject *f) PyErr_BadInternalCall(); return -1; } - limitv = PySys_GetObject("tracebacklimit"); - if (limitv && PyLong_Check(limitv)) { + if (_PySys_GetOptionalAttrString("tracebacklimit", &limitv) < 0) { + return -1; + } + else if (limitv != NULL && PyLong_Check(limitv)) { int overflow; limit = PyLong_AsLongAndOverflow(limitv, &overflow); if (overflow > 0) { limit = LONG_MAX; } else if (limit <= 0) { + Py_DECREF(limitv); return 0; } } + Py_XDECREF(limitv); if (PyFile_WriteString(header, f) < 0) { return -1; |
