From fad687494a788129d20f8350956b3447e79656f7 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Thu, 6 Feb 2025 16:40:47 +0200 Subject: [PATCH 1/2] gh-108512: Add and use new replacements for PySys_GetObject() Add functions PySys_GetAttr() and PySys_GetAttrString(). --- Doc/c-api/init_config.rst | 2 +- Doc/c-api/sys.rst | 25 +++ Doc/data/stable_abi.dat | 2 + Doc/whatsnew/3.14.rst | 4 + Include/cpython/sysmodule.h | 23 +++ Include/internal/pycore_sysmodule.h | 4 +- Include/sysmodule.h | 4 + Lib/test/test_capi/test_sys.py | 32 ++++ Lib/test/test_stable_abi_ctypes.py | 2 + ...-10-18-14-36-35.gh-issue-108512.fMZLfr.rst | 1 + Misc/stable_abi.toml | 4 + Modules/_cursesmodule.c | 11 +- Modules/_lsprof.c | 7 +- Modules/_pickle.c | 13 +- Modules/_testlimitedcapi/sys.c | 53 ++++++ Modules/_threadmodule.c | 11 +- Modules/_tkinter.c | 13 +- Modules/faulthandler.c | 37 ++-- Modules/main.c | 13 +- Modules/syslogmodule.c | 27 ++- Objects/moduleobject.c | 7 +- PC/python3dll.c | 2 + Python/_warnings.c | 8 +- Python/bltinmodule.c | 96 ++++++---- Python/ceval.c | 7 +- Python/errors.c | 21 ++- Python/import.c | 36 ++-- Python/initconfig.c | 25 +-- Python/intrinsics.c | 12 +- Python/pylifecycle.c | 43 +++-- Python/pythonrun.c | 100 +++++++--- Python/sysmodule.c | 171 +++++++++++++----- Python/traceback.c | 18 +- 33 files changed, 613 insertions(+), 221 deletions(-) create mode 100644 Include/cpython/sysmodule.h create mode 100644 Misc/NEWS.d/next/C_API/2023-10-18-14-36-35.gh-issue-108512.fMZLfr.rst diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst index b791d3cdc5d95c..4980534eae9a65 100644 --- a/Doc/c-api/init_config.rst +++ b/Doc/c-api/init_config.rst @@ -2098,7 +2098,7 @@ initialization:: /* Specify sys.path explicitly */ /* If you want to modify the default set of paths, finish - initialization first and then use PySys_GetObject("path") */ + initialization first and then use PySys_GetAttrString("path", ...) */ config.module_search_paths_set = 1; status = PyWideStringList_Append(&config.module_search_paths, L"/path/to/stdlib"); diff --git a/Doc/c-api/sys.rst b/Doc/c-api/sys.rst index 4ab5df4ccccdbb..194c33874d84e5 100644 --- a/Doc/c-api/sys.rst +++ b/Doc/c-api/sys.rst @@ -258,11 +258,36 @@ These are utility functions that make functionality from the :mod:`sys` module accessible to C code. They all work with the current interpreter thread's :mod:`sys` module's dict, which is contained in the internal thread state structure. +.. c:function:: int PySys_GetAttr(PyObject *name, PyObject **result); + + Get the attribute *name* of the :mod:`sys` module. + + If the object exists, set *\*result* to a new :term:`strong reference` + to the object and return ``1``. + If the object does not exist, set *\*result* to ``NULL`` and return ``0``, + without setting an exception. + If other error occurred, set an exception, set *\*result* to ``NULL`` and + return ``-1``. + + .. versionadded:: next + +.. c:function:: int PySys_GetAttrString(const char *name, PyObject **result); + + This is the same as :c:func:`PySys_GetAttr`, but *name* is + specified as a :c:expr:`const char*` UTF-8 encoded bytes string, + rather than a :c:expr:`PyObject*`. + + .. versionadded:: next + .. c:function:: PyObject *PySys_GetObject(const char *name) Return the object *name* from the :mod:`sys` module or ``NULL`` if it does not exist, without setting an exception. + Preserves exception that was set before the call. + + It is recommended to use :c:func:`PySys_GetAttrString` instead. + .. c:function:: int PySys_SetObject(const char *name, PyObject *v) Set *name* in the :mod:`sys` module to *v* unless *v* is ``NULL``, in which diff --git a/Doc/data/stable_abi.dat b/Doc/data/stable_abi.dat index 59e7a31bc2ef06..e07880559afd27 100644 --- a/Doc/data/stable_abi.dat +++ b/Doc/data/stable_abi.dat @@ -625,6 +625,8 @@ func,PySys_Audit,3.13,, func,PySys_AuditTuple,3.13,, func,PySys_FormatStderr,3.2,, func,PySys_FormatStdout,3.2,, +func,PySys_GetAttr,3.14,, +func,PySys_GetAttrString,3.14,, func,PySys_GetObject,3.2,, func,PySys_GetXOptions,3.7,, func,PySys_ResetWarnOptions,3.2,, diff --git a/Doc/whatsnew/3.14.rst b/Doc/whatsnew/3.14.rst index 59c432d30a342b..2e147855f7dd5f 100644 --- a/Doc/whatsnew/3.14.rst +++ b/Doc/whatsnew/3.14.rst @@ -1296,6 +1296,10 @@ New features (Contributed by Sergey B Kirpichev and Victor Stinner in :gh:`102471`.) +* Add :c:func:`PySys_GetAttr` and :c:func:`PySys_GetAttrString` + functions as replacements for :c:func:`PySys_GetObject`. + (Contributed by Serhiy Storchaka in :gh:`108512`.) + * Add :c:func:`PyType_GetBaseByToken` and :c:data:`Py_tp_token` slot for easier superclass identification, which attempts to resolve the `type checking issue `__ mentioned in :pep:`630` diff --git a/Include/cpython/sysmodule.h b/Include/cpython/sysmodule.h new file mode 100644 index 00000000000000..df12ae440f024b --- /dev/null +++ b/Include/cpython/sysmodule.h @@ -0,0 +1,23 @@ +#ifndef Py_CPYTHON_SYSMODULE_H +# error "this header file must not be included directly" +#endif + +typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *); + +PyAPI_FUNC(int) PySys_Audit( + const char *event, + const char *format, + ...); +PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*); + +typedef struct { + FILE* perf_map; + PyThread_type_lock map_lock; +} PerfMapState; + +PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void); +PyAPI_FUNC(int) PyUnstable_WritePerfMapEntry( + const void *code_addr, + unsigned int code_size, + const char *entry_name); +PyAPI_FUNC(void) PyUnstable_PerfMapState_Fini(void); diff --git a/Include/internal/pycore_sysmodule.h b/Include/internal/pycore_sysmodule.h index 99968df54a45f6..eca29373754026 100644 --- a/Include/internal/pycore_sysmodule.h +++ b/Include/internal/pycore_sysmodule.h @@ -8,8 +8,8 @@ extern "C" { # error "this header requires Py_BUILD_CORE define" #endif -// Export for '_pickle' shared extension -PyAPI_FUNC(PyObject*) _PySys_GetAttr(PyThreadState *tstate, PyObject *name); +PyAPI_FUNC(PyObject *) _PySys_GetRequiredAttr(PyObject *); +PyAPI_FUNC(PyObject *) _PySys_GetRequiredAttrString(const char *); // Export for '_pickle' shared extension PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); diff --git a/Include/sysmodule.h b/Include/sysmodule.h index c1d5f610fe08a5..5e8373c07dfe10 100644 --- a/Include/sysmodule.h +++ b/Include/sysmodule.h @@ -4,6 +4,10 @@ extern "C" { #endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030e0000 +PyAPI_FUNC(int) PySys_GetAttr(PyObject *, PyObject **); +PyAPI_FUNC(int) PySys_GetAttrString(const char *, PyObject **); +#endif PyAPI_FUNC(PyObject *) PySys_GetObject(const char *); PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *); diff --git a/Lib/test/test_capi/test_sys.py b/Lib/test/test_capi/test_sys.py index d3a9b378e7769a..1461d7a73b59c8 100644 --- a/Lib/test/test_capi/test_sys.py +++ b/Lib/test/test_capi/test_sys.py @@ -9,6 +9,11 @@ except ImportError: _testlimitedcapi = None +try: + import _testinternalcapi +except ImportError: + _testinternalcapi = None + NULL = None class CAPITest(unittest.TestCase): @@ -19,6 +24,33 @@ class CAPITest(unittest.TestCase): maxDiff = None + @unittest.skipIf(_testlimitedcapi is None, 'need _testlimitedcapi module') + def test_sys_getattr(self): + # Test PySys_GetAttr() + sys_getattr = _testlimitedcapi.sys_getattr + + self.assertIs(sys_getattr('stdout'), sys.stdout) + with support.swap_attr(sys, '\U0001f40d', 42): + self.assertEqual(sys_getattr('\U0001f40d'), 42) + + self.assertIs(sys_getattr('nonexisting'), AttributeError) + self.assertRaises(TypeError, sys_getattr, 1) + self.assertRaises(TypeError, sys_getattr, []) + # CRASHES sys_getattr(NULL) + + @unittest.skipIf(_testlimitedcapi is None, 'need _testlimitedcapi module') + def test_sys_getattrstring(self): + # Test PySys_GetAttrString() + getattrstring = _testlimitedcapi.sys_getattrstring + + self.assertIs(getattrstring(b'stdout'), sys.stdout) + with support.swap_attr(sys, '\U0001f40d', 42): + self.assertEqual(getattrstring('\U0001f40d'.encode()), 42) + + self.assertIs(getattrstring(b'nonexisting'), AttributeError) + self.assertRaises(UnicodeDecodeError, getattrstring, b'\xff') + # CRASHES getattrstring(NULL) + @support.cpython_only @unittest.skipIf(_testlimitedcapi is None, 'need _testlimitedcapi module') def test_sys_getobject(self): diff --git a/Lib/test/test_stable_abi_ctypes.py b/Lib/test/test_stable_abi_ctypes.py index f3724ce6d4d15a..8ff30fdbae1d6a 100644 --- a/Lib/test/test_stable_abi_ctypes.py +++ b/Lib/test/test_stable_abi_ctypes.py @@ -655,6 +655,8 @@ def test_windows_feature_macros(self): "PySys_AuditTuple", "PySys_FormatStderr", "PySys_FormatStdout", + "PySys_GetAttr", + "PySys_GetAttrString", "PySys_GetObject", "PySys_GetXOptions", "PySys_HasWarnOptions", diff --git a/Misc/NEWS.d/next/C_API/2023-10-18-14-36-35.gh-issue-108512.fMZLfr.rst b/Misc/NEWS.d/next/C_API/2023-10-18-14-36-35.gh-issue-108512.fMZLfr.rst new file mode 100644 index 00000000000000..d67ba554a24484 --- /dev/null +++ b/Misc/NEWS.d/next/C_API/2023-10-18-14-36-35.gh-issue-108512.fMZLfr.rst @@ -0,0 +1 @@ +Add functions :c:func:`PySys_GetAttr` and :c:func:`PySys_GetAttrString`. diff --git a/Misc/stable_abi.toml b/Misc/stable_abi.toml index 9317be605f0065..fe3e8760dd09ae 100644 --- a/Misc/stable_abi.toml +++ b/Misc/stable_abi.toml @@ -2545,3 +2545,7 @@ added = '3.14' [function.Py_PACK_VERSION] added = '3.14' +[function.PySys_GetAttr] + added = '3.14' +[function.PySys_GetAttrString] + added = '3.14' diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c index 7213a5be07de4b..372a39f14a1cf5 100644 --- a/Modules/_cursesmodule.c +++ b/Modules/_cursesmodule.c @@ -108,6 +108,7 @@ static const char PyCursesVersion[] = "2.2"; #include "pycore_capsule.h" // _PyCapsule_SetTraverse() #include "pycore_long.h" // _PyLong_GetZero() #include "pycore_structseq.h" // _PyStructSequence_NewType() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttrString() #ifdef __hpux #define STRICT_SYSV_CURSES @@ -3542,16 +3543,20 @@ _curses_setupterm_impl(PyObject *module, const char *term, int fd) if (fd == -1) { PyObject* sys_stdout; - sys_stdout = PySys_GetObject("stdout"); + sys_stdout = _PySys_GetRequiredAttrString("stdout"); + if (sys_stdout == NULL) { + return NULL; + } - if (sys_stdout == NULL || sys_stdout == Py_None) { + if (sys_stdout == Py_None) { cursesmodule_state *state = get_cursesmodule_state(module); PyErr_SetString(state->error, "lost sys.stdout"); + Py_DECREF(sys_stdout); return NULL; } fd = PyObject_AsFileDescriptor(sys_stdout); - + Py_DECREF(sys_stdout); if (fd == -1) { return NULL; } diff --git a/Modules/_lsprof.c b/Modules/_lsprof.c index eab26b39be14ef..2618f12d30056f 100644 --- a/Modules/_lsprof.c +++ b/Modules/_lsprof.c @@ -6,6 +6,7 @@ #include "pycore_call.h" // _PyObject_CallNoArgs() #include "pycore_ceval.h" // _PyEval_SetProfile() #include "pycore_pystate.h" // _PyThreadState_GET() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttrString() #include "pycore_time.h" // _PyTime_FromLong() #include "rotatingtree.h" @@ -777,7 +778,7 @@ _lsprof_Profiler_enable_impl(ProfilerObject *self, int subcalls, return NULL; } - PyObject* monitoring = PyImport_ImportModuleAttrString("sys", "monitoring"); + PyObject* monitoring = _PySys_GetRequiredAttrString("monitoring"); if (!monitoring) { return NULL; } @@ -859,7 +860,7 @@ _lsprof_Profiler_disable_impl(ProfilerObject *self) } if (self->flags & POF_ENABLED) { PyObject* result = NULL; - PyObject* monitoring = PyImport_ImportModuleAttrString("sys", "monitoring"); + PyObject* monitoring = _PySys_GetRequiredAttrString("monitoring"); if (!monitoring) { return NULL; @@ -976,7 +977,7 @@ profiler_init_impl(ProfilerObject *self, PyObject *timer, double timeunit, Py_XSETREF(self->externalTimer, Py_XNewRef(timer)); self->tool_id = PY_MONITORING_PROFILER_ID; - PyObject* monitoring = PyImport_ImportModuleAttrString("sys", "monitoring"); + PyObject* monitoring = _PySys_GetRequiredAttrString("monitoring"); if (!monitoring) { return -1; } diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 5641f93391c551..0e744944f6d929 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -19,7 +19,7 @@ #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_runtime.h" // _Py_ID() #include "pycore_setobject.h" // _PySet_NextEntry() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_GetSizeOf() #include // strtol() @@ -1902,10 +1902,8 @@ whichmodule(PickleState *st, PyObject *global, PyObject *global_name, PyObject * __module__ can be None. If it is so, then search sys.modules for the module of global. */ Py_CLEAR(module_name); - PyThreadState *tstate = _PyThreadState_GET(); - modules = _PySys_GetAttr(tstate, &_Py_ID(modules)); + modules = _PySys_GetRequiredAttr(&_Py_ID(modules)); if (modules == NULL) { - PyErr_SetString(PyExc_RuntimeError, "unable to get sys.modules"); return NULL; } if (PyDict_CheckExact(modules)) { @@ -1915,11 +1913,13 @@ whichmodule(PickleState *st, PyObject *global, PyObject *global_name, PyObject * Py_INCREF(module); if (_checkmodule(module_name, module, global, dotted_path) == 0) { Py_DECREF(module); + Py_DECREF(modules); return module_name; } Py_DECREF(module); Py_DECREF(module_name); if (PyErr_Occurred()) { + Py_DECREF(modules); return NULL; } } @@ -1927,6 +1927,7 @@ whichmodule(PickleState *st, PyObject *global, PyObject *global_name, PyObject * else { PyObject *iterator = PyObject_GetIter(modules); if (iterator == NULL) { + Py_DECREF(modules); return NULL; } while ((module_name = PyIter_Next(iterator))) { @@ -1934,22 +1935,26 @@ whichmodule(PickleState *st, PyObject *global, PyObject *global_name, PyObject * if (module == NULL) { Py_DECREF(module_name); Py_DECREF(iterator); + Py_DECREF(modules); return NULL; } if (_checkmodule(module_name, module, global, dotted_path) == 0) { Py_DECREF(module); Py_DECREF(iterator); + Py_DECREF(modules); return module_name; } Py_DECREF(module); Py_DECREF(module_name); if (PyErr_Occurred()) { Py_DECREF(iterator); + Py_DECREF(modules); return NULL; } } Py_DECREF(iterator); } + Py_DECREF(modules); if (PyErr_Occurred()) { return NULL; } diff --git a/Modules/_testlimitedcapi/sys.c b/Modules/_testlimitedcapi/sys.c index 7d8b7a8569e515..ed3383ed72aa7f 100644 --- a/Modules/_testlimitedcapi/sys.c +++ b/Modules/_testlimitedcapi/sys.c @@ -1,7 +1,58 @@ +#include "pyconfig.h" // Py_GIL_DISABLED +// Need limited C API version 3.14 for PySys_GetAttr() etc +#if !defined(Py_GIL_DISABLED) && !defined(Py_LIMITED_API) +# define Py_LIMITED_API 0x030e0000 +#endif #include "parts.h" #include "util.h" +static PyObject * +sys_getattr(PyObject *Py_UNUSED(module), PyObject *name) +{ + PyObject *value = UNINITIALIZED_PTR; + NULLABLE(name); + + switch (PySys_GetAttr(name, &value)) { + case -1: + assert(value == NULL); + assert(PyErr_Occurred()); + return NULL; + case 0: + assert(value == NULL); + return Py_NewRef(PyExc_AttributeError); + case 1: + return value; + default: + Py_FatalError("PySys_GetAttr() returned invalid code"); + } +} + +static PyObject * +sys_getattrstring(PyObject *Py_UNUSED(module), PyObject *arg) +{ + PyObject *value = UNINITIALIZED_PTR; + const char *name; + Py_ssize_t size; + if (!PyArg_Parse(arg, "z#", &name, &size)) { + return NULL; + } + + switch (PySys_GetAttrString(name, &value)) { + case -1: + assert(value == NULL); + assert(PyErr_Occurred()); + return NULL; + case 0: + assert(value == NULL); + return Py_NewRef(PyExc_AttributeError); + case 1: + return value; + default: + Py_FatalError("PySys_GetAttrString() returned invalid code"); + } +} + static PyObject * sys_getobject(PyObject *Py_UNUSED(module), PyObject *arg) { @@ -39,6 +90,8 @@ sys_getxoptions(PyObject *Py_UNUSED(module), PyObject *Py_UNUSED(ignored)) static PyMethodDef test_methods[] = { + {"sys_getattr", sys_getattr, METH_O}, + {"sys_getattrstring", sys_getattrstring, METH_O}, {"sys_getobject", sys_getobject, METH_O}, {"sys_setobject", sys_setobject, METH_VARARGS}, {"sys_getxoptions", sys_getxoptions, METH_NOARGS}, diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index e251736fb36aa9..62d09fb6d89c23 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -8,7 +8,6 @@ #include "pycore_modsupport.h" // _PyArg_NoKeywords() #include "pycore_pylifecycle.h" #include "pycore_pystate.h" // _PyThreadState_SetCurrent() -#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_time.h" // _PyTime_FromSeconds() #include "pycore_weakref.h" // _PyWeakref_GET_REF() @@ -2242,9 +2241,12 @@ thread_excepthook(PyObject *module, PyObject *args) PyObject *exc_tb = PyStructSequence_GET_ITEM(args, 2); PyObject *thread = PyStructSequence_GET_ITEM(args, 3); - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *file = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + PyObject *file; + if (PySys_GetAttr( &_Py_ID(stderr), &file) < 0) { + return NULL; + } if (file == NULL || file == Py_None) { + Py_XDECREF(file); if (thread == Py_None) { /* do nothing if sys.stderr is None and thread is None */ Py_RETURN_NONE; @@ -2261,9 +2263,6 @@ thread_excepthook(PyObject *module, PyObject *args) Py_RETURN_NONE; } } - else { - Py_INCREF(file); - } int res = thread_excepthook_file(file, exc_type, exc_value, exc_tb, thread); diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 45897817a56051..c93a33591bf408 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -31,6 +31,7 @@ Copyright (C) 1994 Steen Lumholt. #endif #include "pycore_long.h" // _PyLong_IsNegative() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttrString() #ifdef MS_WINDOWS # include @@ -143,7 +144,7 @@ _get_tcl_lib_path(void) struct stat stat_buf; int stat_return_value; - PyObject *prefix = PySys_GetObject("base_prefix"); // borrowed reference + PyObject *prefix = _PySys_GetRequiredAttrString("base_prefix"); if (prefix == NULL) { return NULL; } @@ -151,9 +152,11 @@ _get_tcl_lib_path(void) /* Check expected location for an installed Python first */ tcl_library_path = PyUnicode_FromString("\\tcl\\tcl" TCL_VERSION); if (tcl_library_path == NULL) { + Py_DECREF(prefix); return NULL; } tcl_library_path = PyUnicode_Concat(prefix, tcl_library_path); + Py_DECREF(prefix); if (tcl_library_path == NULL) { return NULL; } @@ -3516,9 +3519,10 @@ PyInit__tkinter(void) /* This helps the dynamic loader; in Unicode aware Tcl versions it also helps Tcl find its encodings. */ - uexe = PySys_GetObject("executable"); // borrowed reference + uexe = _PySys_GetRequiredAttrString("executable"); if (uexe && PyUnicode_Check(uexe)) { // sys.executable can be None cexe = PyUnicode_EncodeFSDefault(uexe); + Py_DECREF(uexe); if (cexe) { #ifdef MS_WINDOWS int set_var = 0; @@ -3531,12 +3535,14 @@ PyInit__tkinter(void) if (!ret && GetLastError() == ERROR_ENVVAR_NOT_FOUND) { str_path = _get_tcl_lib_path(); if (str_path == NULL && PyErr_Occurred()) { + Py_DECREF(cexe); Py_DECREF(m); return NULL; } if (str_path != NULL) { wcs_path = PyUnicode_AsWideCharString(str_path, NULL); if (wcs_path == NULL) { + Py_DECREF(cexe); Py_DECREF(m); return NULL; } @@ -3557,6 +3563,9 @@ PyInit__tkinter(void) } Py_XDECREF(cexe); } + else { + Py_XDECREF(uexe); + } if (PyErr_Occurred()) { Py_DECREF(m); diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c index a15ced22677ab7..87de1cc30e3593 100644 --- a/Modules/faulthandler.c +++ b/Modules/faulthandler.c @@ -4,7 +4,7 @@ #include "pycore_pyerrors.h" // _Py_DumpExtensionModules #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_signal.h" // Py_NSIG -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttr() #include "pycore_time.h" // _PyTime_FromSecondsObject() #include "pycore_traceback.h" // _Py_DumpTracebackThreads @@ -111,14 +111,13 @@ faulthandler_get_fileno(PyObject **file_ptr) PyObject *file = *file_ptr; if (file == NULL || file == Py_None) { - PyThreadState *tstate = _PyThreadState_GET(); - file = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + file = _PySys_GetRequiredAttr(&_Py_ID(stderr)); if (file == NULL) { - PyErr_SetString(PyExc_RuntimeError, "unable to get sys.stderr"); return -1; } if (file == Py_None) { PyErr_SetString(PyExc_RuntimeError, "sys.stderr is None"); + Py_DECREF(file); return -1; } } @@ -141,10 +140,15 @@ faulthandler_get_fileno(PyObject **file_ptr) *file_ptr = NULL; return fd; } + else { + Py_INCREF(file); + } result = PyObject_CallMethodNoArgs(file, &_Py_ID(fileno)); - if (result == NULL) + if (result == NULL) { + Py_DECREF(file); return -1; + } fd = -1; if (PyLong_Check(result)) { @@ -157,6 +161,7 @@ faulthandler_get_fileno(PyObject **file_ptr) if (fd == -1) { PyErr_SetString(PyExc_RuntimeError, "file.fileno() is not a valid file descriptor"); + Py_DECREF(file); return -1; } @@ -239,8 +244,10 @@ faulthandler_dump_traceback_py(PyObject *self, return NULL; tstate = get_thread_state(); - if (tstate == NULL) + if (tstate == NULL) { + Py_XDECREF(file); return NULL; + } if (all_threads) { PyInterpreterState *interp = _PyInterpreterState_GET(); @@ -251,12 +258,14 @@ faulthandler_dump_traceback_py(PyObject *self, _PyEval_StartTheWorld(interp); if (errmsg != NULL) { PyErr_SetString(PyExc_RuntimeError, errmsg); + Py_XDECREF(file); return NULL; } } else { _Py_DumpTraceback(fd, tstate); } + Py_XDECREF(file); if (PyErr_CheckSignals()) return NULL; @@ -539,10 +548,11 @@ faulthandler_py_enable(PyObject *self, PyObject *args, PyObject *kwargs) return NULL; tstate = get_thread_state(); - if (tstate == NULL) + if (tstate == NULL) { + Py_XDECREF(file); return NULL; + } - Py_XINCREF(file); Py_XSETREF(fatal_error.file, file); fatal_error.fd = fd; fatal_error.all_threads = all_threads; @@ -732,12 +742,14 @@ faulthandler_dump_traceback_later(PyObject *self, if (!thread.running) { thread.running = PyThread_allocate_lock(); if (!thread.running) { + Py_XDECREF(file); return PyErr_NoMemory(); } } if (!thread.cancel_event) { thread.cancel_event = PyThread_allocate_lock(); if (!thread.cancel_event || !thread.running) { + Py_XDECREF(file); return PyErr_NoMemory(); } @@ -749,6 +761,7 @@ faulthandler_dump_traceback_later(PyObject *self, /* format the timeout */ header = format_timeout(timeout_us); if (header == NULL) { + Py_XDECREF(file); return PyErr_NoMemory(); } header_len = strlen(header); @@ -756,7 +769,6 @@ faulthandler_dump_traceback_later(PyObject *self, /* Cancel previous thread, if running */ cancel_dump_traceback_later(); - Py_XINCREF(file); Py_XSETREF(thread.file, file); thread.fd = fd; /* the downcast is safe: we check that 0 < timeout_us < PY_TIMEOUT_MAX */ @@ -918,14 +930,17 @@ faulthandler_register_py(PyObject *self, if (user_signals == NULL) { user_signals = PyMem_Calloc(Py_NSIG, sizeof(user_signal_t)); - if (user_signals == NULL) + if (user_signals == NULL) { + Py_XDECREF(file); return PyErr_NoMemory(); + } } user = &user_signals[signum]; if (!user->enabled) { #ifdef FAULTHANDLER_USE_ALT_STACK if (faulthandler_allocate_stack() < 0) { + Py_XDECREF(file); return NULL; } #endif @@ -933,13 +948,13 @@ faulthandler_register_py(PyObject *self, err = faulthandler_register(signum, chain, &previous); if (err) { PyErr_SetFromErrno(PyExc_OSError); + Py_XDECREF(file); return NULL; } user->previous = previous; } - Py_XINCREF(file); Py_XSETREF(user->file, file); user->fd = fd; user->all_threads = all_threads; diff --git a/Modules/main.c b/Modules/main.c index f8a2438cdd0d93..76f31493f98c14 100644 --- a/Modules/main.c +++ b/Modules/main.c @@ -489,16 +489,13 @@ pymain_run_startup(PyConfig *config, int *exitcode) static int pymain_run_interactive_hook(int *exitcode) { - PyObject *hook = PyImport_ImportModuleAttrString("sys", - "__interactivehook__"); - if (hook == NULL) { - if (PyErr_ExceptionMatches(PyExc_AttributeError)) { - // no sys.__interactivehook__ attribute - PyErr_Clear(); - return 0; - } + PyObject *hook; + if (PySys_GetAttrString("__interactivehook__", &hook) < 0) { goto error; } + if (hook == NULL) { + return 0; + } if (PySys_Audit("cpython.run_interactivehook", "O", hook) < 0) { goto error; diff --git a/Modules/syslogmodule.c b/Modules/syslogmodule.c index aa1bc9da91dfb9..53d6ce4843e637 100644 --- a/Modules/syslogmodule.c +++ b/Modules/syslogmodule.c @@ -56,6 +56,7 @@ Revision history: #include "Python.h" #include "osdefs.h" // SEP +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttrString() #include @@ -89,45 +90,51 @@ syslog_get_argv(void) Py_ssize_t argv_len, scriptlen; PyObject *scriptobj; Py_ssize_t slash; - PyObject *argv = PySys_GetObject("argv"); + PyObject *argv = _PySys_GetRequiredAttrString("argv"); if (argv == NULL) { - return(NULL); + PyErr_Clear(); + return NULL; } argv_len = PyList_Size(argv); if (argv_len == -1) { PyErr_Clear(); - return(NULL); + Py_DECREF(argv); + return NULL; } if (argv_len == 0) { - return(NULL); + Py_DECREF(argv); + return NULL; } scriptobj = PyList_GetItem(argv, 0); + Py_XINCREF(scriptobj); + Py_DECREF(argv); if (scriptobj == NULL) { PyErr_Clear(); return NULL; } if (!PyUnicode_Check(scriptobj)) { - return(NULL); + Py_DECREF(scriptobj); + return NULL; } scriptlen = PyUnicode_GET_LENGTH(scriptobj); if (scriptlen == 0) { - return(NULL); + Py_DECREF(scriptobj); + return NULL; } slash = PyUnicode_FindChar(scriptobj, SEP, 0, scriptlen, -1); if (slash == -2) { PyErr_Clear(); + Py_DECREF(scriptobj); return NULL; } if (slash != -1) { - return PyUnicode_Substring(scriptobj, slash + 1, scriptlen); - } else { - Py_INCREF(scriptobj); - return(scriptobj); + Py_SETREF(scriptobj, PyUnicode_Substring(scriptobj, slash + 1, scriptlen)); } + return scriptobj; } diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c index 740392b061ba9a..f6216fbba05bd1 100644 --- a/Objects/moduleobject.c +++ b/Objects/moduleobject.c @@ -1003,13 +1003,18 @@ _Py_module_getattro_impl(PyModuleObject *m, PyObject *name, int suppress) } int is_possibly_shadowing_stdlib = 0; if (is_possibly_shadowing) { - PyObject *stdlib_modules = PySys_GetObject("stdlib_module_names"); + PyObject *stdlib_modules; + if (PySys_GetAttrString("stdlib_module_names", &stdlib_modules) < 0) { + goto done; + } if (stdlib_modules && PyAnySet_Check(stdlib_modules)) { is_possibly_shadowing_stdlib = PySet_Contains(stdlib_modules, mod_name); if (is_possibly_shadowing_stdlib < 0) { + Py_DECREF(stdlib_modules); goto done; } } + Py_XDECREF(stdlib_modules); } if (is_possibly_shadowing_stdlib) { diff --git a/PC/python3dll.c b/PC/python3dll.c index 84b3c735240b73..bcc2ba4125c738 100755 --- a/PC/python3dll.c +++ b/PC/python3dll.c @@ -592,6 +592,8 @@ EXPORT_FUNC(PySys_Audit) EXPORT_FUNC(PySys_AuditTuple) EXPORT_FUNC(PySys_FormatStderr) EXPORT_FUNC(PySys_FormatStdout) +EXPORT_FUNC(PySys_GetAttr) +EXPORT_FUNC(PySys_GetAttrString) EXPORT_FUNC(PySys_GetObject) EXPORT_FUNC(PySys_GetXOptions) EXPORT_FUNC(PySys_HasWarnOptions) diff --git a/Python/_warnings.c b/Python/_warnings.c index bb195da9512caf..e20e6ee04890cc 100644 --- a/Python/_warnings.c +++ b/Python/_warnings.c @@ -5,7 +5,7 @@ #include "pycore_pyerrors.h" // _PyErr_Occurred() #include "pycore_pylifecycle.h" // _Py_IsInterpreterFinalizing() #include "pycore_pystate.h" // _PyThreadState_GET() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttr() #include "pycore_traceback.h" // _Py_DisplaySourceLine() #include @@ -549,7 +549,7 @@ static void show_warning(PyThreadState *tstate, PyObject *filename, int lineno, PyObject *text, PyObject *category, PyObject *sourceline) { - PyObject *f_stderr; + PyObject *f_stderr = NULL; PyObject *name; char lineno_str[128]; @@ -560,9 +560,8 @@ show_warning(PyThreadState *tstate, PyObject *filename, int lineno, goto error; } - f_stderr = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + f_stderr = _PySys_GetRequiredAttr(&_Py_ID(stderr)); if (f_stderr == NULL) { - fprintf(stderr, "lost sys.stderr\n"); goto error; } @@ -611,6 +610,7 @@ show_warning(PyThreadState *tstate, PyObject *filename, int lineno, } error: + Py_XDECREF(f_stderr); Py_XDECREF(name); PyErr_Clear(); } diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 46a6fd9a8ef017..54cf9cd8e32642 100644 --- a/Python/bltinmodule.c +++ b/Python/bltinmodule.c @@ -11,9 +11,9 @@ #include "pycore_pyerrors.h" // _PyErr_NoMemory() #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_pythonrun.h" // _Py_SourceAsString() -#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_tuple.h" // _PyTuple_FromArray() #include "pycore_cell.h" // PyCell_GetRef() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttr() #include "clinic/bltinmodule.c.h" @@ -462,18 +462,16 @@ builtin_callable(PyObject *module, PyObject *obj) static PyObject * builtin_breakpoint(PyObject *self, PyObject *const *args, Py_ssize_t nargs, PyObject *keywords) { - PyObject *hook = PySys_GetObject("breakpointhook"); - + PyObject *hook = _PySys_GetRequiredAttrString("breakpointhook"); if (hook == NULL) { - PyErr_SetString(PyExc_RuntimeError, "lost sys.breakpointhook"); return NULL; } if (PySys_Audit("builtins.breakpoint", "O", hook) < 0) { + Py_DECREF(hook); return NULL; } - Py_INCREF(hook); PyObject *retval = PyObject_Vectorcall(hook, args, nargs, keywords); Py_DECREF(hook); return retval; @@ -2168,18 +2166,20 @@ builtin_print_impl(PyObject *module, PyObject * const *args, int i, err; if (file == Py_None) { - PyThreadState *tstate = _PyThreadState_GET(); - file = _PySys_GetAttr(tstate, &_Py_ID(stdout)); + file = _PySys_GetRequiredAttr(&_Py_ID(stdout)); if (file == NULL) { - PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout"); return NULL; } /* sys.stdout may be None when FILE* stdout isn't connected */ if (file == Py_None) { + Py_DECREF(file); Py_RETURN_NONE; } } + else { + Py_INCREF(file); + } if (sep == Py_None) { sep = NULL; @@ -2188,6 +2188,7 @@ builtin_print_impl(PyObject *module, PyObject * const *args, PyErr_Format(PyExc_TypeError, "sep must be None or a string, not %.200s", Py_TYPE(sep)->tp_name); + Py_DECREF(file); return NULL; } if (end == Py_None) { @@ -2197,6 +2198,7 @@ builtin_print_impl(PyObject *module, PyObject * const *args, PyErr_Format(PyExc_TypeError, "end must be None or a string, not %.200s", Py_TYPE(end)->tp_name); + Py_DECREF(file); return NULL; } @@ -2209,11 +2211,13 @@ builtin_print_impl(PyObject *module, PyObject * const *args, err = PyFile_WriteObject(sep, file, Py_PRINT_RAW); } if (err) { + Py_DECREF(file); return NULL; } } err = PyFile_WriteObject(args[i], file, Py_PRINT_RAW); if (err) { + Py_DECREF(file); return NULL; } } @@ -2225,14 +2229,17 @@ builtin_print_impl(PyObject *module, PyObject * const *args, err = PyFile_WriteObject(end, file, Py_PRINT_RAW); } if (err) { + Py_DECREF(file); return NULL; } if (flush) { if (_PyFile_Flush(file) < 0) { + Py_DECREF(file); return NULL; } } + Py_DECREF(file); Py_RETURN_NONE; } @@ -2257,36 +2264,41 @@ static PyObject * builtin_input_impl(PyObject *module, PyObject *prompt) /*[clinic end generated code: output=83db5a191e7a0d60 input=159c46d4ae40977e]*/ { - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *fin = _PySys_GetAttr( - tstate, &_Py_ID(stdin)); - PyObject *fout = _PySys_GetAttr( - tstate, &_Py_ID(stdout)); - PyObject *ferr = _PySys_GetAttr( - tstate, &_Py_ID(stderr)); + PyObject *fin = NULL; + PyObject *fout = NULL; + PyObject *ferr = NULL; PyObject *tmp; long fd; int tty; /* Check that stdin/out/err are intact */ - if (fin == NULL || fin == Py_None) { - PyErr_SetString(PyExc_RuntimeError, - "input(): lost sys.stdin"); - return NULL; + fin = _PySys_GetRequiredAttr(&_Py_ID(stdin)); + if (fin == NULL) { + goto error; } - if (fout == NULL || fout == Py_None) { - PyErr_SetString(PyExc_RuntimeError, - "input(): lost sys.stdout"); - return NULL; + if (fin == Py_None) { + PyErr_SetString(PyExc_RuntimeError, "lost sys.stdin"); + goto error; } - if (ferr == NULL || ferr == Py_None) { - PyErr_SetString(PyExc_RuntimeError, - "input(): lost sys.stderr"); - return NULL; + fout = _PySys_GetRequiredAttr(&_Py_ID(stdout)); + if (fout == NULL) { + goto error; + } + if (fout == Py_None) { + PyErr_SetString(PyExc_RuntimeError, "lost sys.stdout"); + goto error; + } + ferr = _PySys_GetRequiredAttr(&_Py_ID(stderr)); + if (ferr == NULL) { + goto error; + } + if (ferr == Py_None) { + PyErr_SetString(PyExc_RuntimeError, "lost sys.stderr"); + goto error; } if (PySys_Audit("builtins.input", "O", prompt ? prompt : Py_None) < 0) { - return NULL; + goto error; } /* First of all, flush stderr */ @@ -2305,8 +2317,9 @@ builtin_input_impl(PyObject *module, PyObject *prompt) else { fd = PyLong_AsLong(tmp); Py_DECREF(tmp); - if (fd < 0 && PyErr_Occurred()) - return NULL; + if (fd < 0 && PyErr_Occurred()) { + goto error; + } tty = fd == fileno(stdin) && isatty(fd); } if (tty) { @@ -2319,7 +2332,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) fd = PyLong_AsLong(tmp); Py_DECREF(tmp); if (fd < 0 && PyErr_Occurred()) - return NULL; + goto error; tty = fd == fileno(stdout) && isatty(fd); } } @@ -2447,10 +2460,13 @@ builtin_input_impl(PyObject *module, PyObject *prompt) if (result != NULL) { if (PySys_Audit("builtins.input/result", "O", result) < 0) { - return NULL; + goto error; } } + Py_DECREF(fin); + Py_DECREF(fout); + Py_DECREF(ferr); return result; _readline_errors: @@ -2460,7 +2476,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt) Py_XDECREF(stdout_errors); Py_XDECREF(po); if (tty) - return NULL; + goto error; PyErr_Clear(); } @@ -2468,12 +2484,22 @@ builtin_input_impl(PyObject *module, PyObject *prompt) /* Fallback if we're not interactive */ if (prompt != NULL) { if (PyFile_WriteObject(prompt, fout, Py_PRINT_RAW) != 0) - return NULL; + goto error; } if (_PyFile_Flush(fout) < 0) { PyErr_Clear(); } - return PyFile_GetLine(fin, -1); + tmp = PyFile_GetLine(fin, -1); + Py_DECREF(fin); + Py_DECREF(fout); + Py_DECREF(ferr); + return tmp; + +error: + Py_XDECREF(fin); + Py_XDECREF(fout); + Py_XDECREF(ferr); + return NULL; } diff --git a/Python/ceval.c b/Python/ceval.c index 4f628fdbabddbb..ecd26ee2c6d817 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -2753,13 +2753,18 @@ _PyEval_ImportFrom(PyThreadState *tstate, PyObject *v, PyObject *name) } int is_possibly_shadowing_stdlib = 0; if (is_possibly_shadowing) { - PyObject *stdlib_modules = PySys_GetObject("stdlib_module_names"); + PyObject *stdlib_modules; + if (PySys_GetAttrString("stdlib_module_names", &stdlib_modules) < 0) { + goto done; + } if (stdlib_modules && PyAnySet_Check(stdlib_modules)) { is_possibly_shadowing_stdlib = PySet_Contains(stdlib_modules, mod_name_or_unknown); if (is_possibly_shadowing_stdlib < 0) { + Py_DECREF(stdlib_modules); goto done; } } + Py_XDECREF(stdlib_modules); } if (origin == NULL && PyModule_Check(v)) { diff --git a/Python/errors.c b/Python/errors.c index 0a19d898da75d7..1cc1d47dd4ed83 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -8,7 +8,6 @@ #include "pycore_pyerrors.h" // _PyErr_Format() #include "pycore_pystate.h" // _PyThreadState_GET() #include "pycore_structseq.h" // _PyStructSequence_FiniBuiltin() -#include "pycore_sysmodule.h" // _PySys_GetAttr() #include "pycore_traceback.h" // _PyTraceBack_FromFrame() #ifdef MS_WINDOWS @@ -1532,14 +1531,15 @@ write_unraisable_exc(PyThreadState *tstate, PyObject *exc_type, PyObject *exc_value, PyObject *exc_tb, PyObject *err_msg, PyObject *obj) { - PyObject *file = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + PyObject *file; + if (PySys_GetAttr(&_Py_ID(stderr), &file) < 0) { + return -1; + } if (file == NULL || file == Py_None) { + Py_XDECREF(file); return 0; } - /* Hold a strong reference to ensure that sys.stderr doesn't go away - while we use it */ - Py_INCREF(file); int res = write_unraisable_exc_file(tstate, exc_type, exc_value, exc_tb, err_msg, obj, file); Py_DECREF(file); @@ -1638,13 +1638,20 @@ format_unraisable_v(const char *format, va_list va, PyObject *obj) goto error; } - PyObject *hook = _PySys_GetAttr(tstate, &_Py_ID(unraisablehook)); + PyObject *hook; + if (PySys_GetAttr(&_Py_ID(unraisablehook), &hook) < 0) { + Py_DECREF(hook_args); + err_msg_str = NULL; + obj = NULL; + goto error; + } if (hook == NULL) { Py_DECREF(hook_args); goto default_hook; } if (_PySys_Audit(tstate, "sys.unraisablehook", "OO", hook, hook_args) < 0) { + Py_DECREF(hook); Py_DECREF(hook_args); err_msg_str = "Exception ignored in audit hook"; obj = NULL; @@ -1652,11 +1659,13 @@ format_unraisable_v(const char *format, va_list va, PyObject *obj) } if (hook == Py_None) { + Py_DECREF(hook); Py_DECREF(hook_args); goto default_hook; } PyObject *res = PyObject_CallOneArg(hook, hook_args); + Py_DECREF(hook); Py_DECREF(hook_args); if (res != NULL) { Py_DECREF(res); diff --git a/Python/import.c b/Python/import.c index 8cc8d3a503bffa..2e30b171f2657c 100644 --- a/Python/import.c +++ b/Python/import.c @@ -3331,19 +3331,15 @@ PyObject * PyImport_GetImporter(PyObject *path) { PyThreadState *tstate = _PyThreadState_GET(); - PyObject *path_importer_cache = PySys_GetObject("path_importer_cache"); + PyObject *path_importer_cache = _PySys_GetRequiredAttrString("path_importer_cache"); if (path_importer_cache == NULL) { - PyErr_SetString(PyExc_RuntimeError, "lost sys.path_importer_cache"); return NULL; } - Py_INCREF(path_importer_cache); - PyObject *path_hooks = PySys_GetObject("path_hooks"); + PyObject *path_hooks = _PySys_GetRequiredAttrString("path_hooks"); if (path_hooks == NULL) { - PyErr_SetString(PyExc_RuntimeError, "lost sys.path_hooks"); Py_DECREF(path_importer_cache); return NULL; } - Py_INCREF(path_hooks); PyObject *importer = get_path_importer(tstate, path_importer_cache, path_hooks, path); Py_DECREF(path_hooks); Py_DECREF(path_importer_cache); @@ -3645,15 +3641,31 @@ import_find_and_load(PyThreadState *tstate, PyObject *abs_name) PyTime_t t1 = 0, accumulated_copy = accumulated; - PyObject *sys_path = PySys_GetObject("path"); - PyObject *sys_meta_path = PySys_GetObject("meta_path"); - PyObject *sys_path_hooks = PySys_GetObject("path_hooks"); + PyObject *sys_path, *sys_meta_path, *sys_path_hooks; + if (PySys_GetAttrString("path", &sys_path) < 0) { + return NULL; + } + if (PySys_GetAttrString("meta_path", &sys_meta_path) < 0) { + Py_XDECREF(sys_path); + return NULL; + } + if (PySys_GetAttrString("path_hooks", &sys_path_hooks) < 0) { + Py_XDECREF(sys_meta_path); + Py_XDECREF(sys_path); + return NULL; + } if (_PySys_Audit(tstate, "import", "OOOOO", abs_name, Py_None, sys_path ? sys_path : Py_None, sys_meta_path ? sys_meta_path : Py_None, sys_path_hooks ? sys_path_hooks : Py_None) < 0) { + Py_XDECREF(sys_path_hooks); + Py_XDECREF(sys_meta_path); + Py_XDECREF(sys_path); return NULL; } + Py_XDECREF(sys_path_hooks); + Py_XDECREF(sys_meta_path); + Py_XDECREF(sys_path); /* XOptions is initialized after first some imports. @@ -4103,10 +4115,8 @@ _PyImport_FiniCore(PyInterpreterState *interp) static int init_zipimport(PyThreadState *tstate, int verbose) { - PyObject *path_hooks = PySys_GetObject("path_hooks"); + PyObject *path_hooks = _PySys_GetRequiredAttrString("path_hooks"); if (path_hooks == NULL) { - _PyErr_SetString(tstate, PyExc_RuntimeError, - "unable to get sys.path_hooks"); return -1; } @@ -4126,12 +4136,14 @@ init_zipimport(PyThreadState *tstate, int verbose) int err = PyList_Insert(path_hooks, 0, zipimporter); Py_DECREF(zipimporter); if (err < 0) { + Py_DECREF(path_hooks); return -1; } if (verbose) { PySys_WriteStderr("# installed zipimport hook\n"); } } + Py_DECREF(path_hooks); return 0; } diff --git a/Python/initconfig.c b/Python/initconfig.c index 4db77ef47d2362..df0b43a95a497a 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -3446,10 +3446,13 @@ _Py_DumpPathConfig(PyThreadState *tstate) #define DUMP_SYS(NAME) \ do { \ - obj = PySys_GetObject(#NAME); \ PySys_FormatStderr(" sys.%s = ", #NAME); \ + if (PySys_GetAttrString(#NAME, &obj) < 0) { \ + PyErr_Clear(); \ + } \ if (obj != NULL) { \ PySys_FormatStderr("%A", obj); \ + Py_DECREF(obj); \ } \ else { \ PySys_WriteStderr("(not set)"); \ @@ -3467,7 +3470,8 @@ _Py_DumpPathConfig(PyThreadState *tstate) DUMP_SYS(exec_prefix); #undef DUMP_SYS - PyObject *sys_path = PySys_GetObject("path"); /* borrowed reference */ + PyObject *sys_path; + (void) PySys_GetAttrString("path", &sys_path); if (sys_path != NULL && PyList_Check(sys_path)) { PySys_WriteStderr(" sys.path = [\n"); Py_ssize_t len = PyList_GET_SIZE(sys_path); @@ -3477,6 +3481,7 @@ _Py_DumpPathConfig(PyThreadState *tstate) } PySys_WriteStderr(" ]\n"); } + Py_XDECREF(sys_path); _PyErr_SetRaisedException(tstate, exc); } @@ -4086,22 +4091,10 @@ _PyConfig_CreateXOptionsDict(const PyConfig *config) } -static PyObject* -config_get_sys(const char *name) -{ - PyObject *value = PySys_GetObject(name); - if (value == NULL) { - PyErr_Format(PyExc_RuntimeError, "lost sys.%s", name); - return NULL; - } - return Py_NewRef(value); -} - - static int config_get_sys_write_bytecode(const PyConfig *config, int *value) { - PyObject *attr = config_get_sys("dont_write_bytecode"); + PyObject *attr = _PySys_GetRequiredAttrString("dont_write_bytecode"); if (attr == NULL) { return -1; } @@ -4122,7 +4115,7 @@ config_get(const PyConfig *config, const PyConfigSpec *spec, { if (use_sys) { if (spec->sys.attr != NULL) { - return config_get_sys(spec->sys.attr); + return _PySys_GetRequiredAttrString(spec->sys.attr); } if (strcmp(spec->name, "write_bytecode") == 0) { diff --git a/Python/intrinsics.c b/Python/intrinsics.c index a6b2c108b67175..275e28f032e3b3 100644 --- a/Python/intrinsics.c +++ b/Python/intrinsics.c @@ -9,7 +9,7 @@ #include "pycore_intrinsics.h" // INTRINSIC_PRINT #include "pycore_pyerrors.h" // _PyErr_SetString() #include "pycore_runtime.h" // _Py_ID() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_GetRequiredAttr() #include "pycore_typevarobject.h" // _Py_make_typevar() @@ -23,16 +23,16 @@ no_intrinsic1(PyThreadState* tstate, PyObject *unused) } static PyObject * -print_expr(PyThreadState* tstate, PyObject *value) +print_expr(PyThreadState* Py_UNUSED(ignored), PyObject *value) { - PyObject *hook = _PySys_GetAttr(tstate, &_Py_ID(displayhook)); + PyObject *hook = _PySys_GetRequiredAttr(&_Py_ID(displayhook)); // Can't use ERROR_IF here. if (hook == NULL) { - _PyErr_SetString(tstate, PyExc_RuntimeError, - "lost sys.displayhook"); return NULL; } - return PyObject_CallOneArg(hook, value); + PyObject *res = PyObject_CallOneArg(hook, value); + Py_DECREF(hook); + return res; } static int diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 300a871d2cc4bf..af89d96407baff 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -27,7 +27,7 @@ #include "pycore_runtime_init.h" // _PyRuntimeState_INIT #include "pycore_setobject.h" // _PySet_NextEntry() #include "pycore_sliceobject.h" // _PySlice_Fini() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_ClearAttrString() #include "pycore_traceback.h" // _Py_DumpTracebackThreads() #include "pycore_uniqueid.h" // _PyObject_FinalizeUniqueIdPool() #include "pycore_typeobject.h" // _PyTypes_InitTypes() @@ -1254,8 +1254,12 @@ init_interp_main(PyThreadState *tstate) if (is_main_interp) { /* Initialize warnings. */ - PyObject *warnoptions = PySys_GetObject("warnoptions"); - if (warnoptions != NULL && PyList_Size(warnoptions) > 0) + PyObject *warnoptions; + if (PySys_GetAttrString("warnoptions", &warnoptions) < 0) { + return _PyStatus_ERR("can't initialize warnings"); + } + if (warnoptions != NULL && PyList_Check(warnoptions) && + PyList_Size(warnoptions) > 0) { PyObject *warnings_module = PyImport_ImportModule("warnings"); if (warnings_module == NULL) { @@ -1264,6 +1268,7 @@ init_interp_main(PyThreadState *tstate) } Py_XDECREF(warnings_module); } + Py_XDECREF(warnoptions); interp->runtime->initialized = 1; } @@ -1770,24 +1775,33 @@ file_is_closed(PyObject *fobj) static int flush_std_files(void) { - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *fout = _PySys_GetAttr(tstate, &_Py_ID(stdout)); - PyObject *ferr = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + PyObject *file; int status = 0; - if (fout != NULL && fout != Py_None && !file_is_closed(fout)) { - if (_PyFile_Flush(fout) < 0) { - PyErr_FormatUnraisable("Exception ignored while flushing sys.stdout"); + if (PySys_GetAttr(&_Py_ID(stdout), &file) < 0) { + status = -1; + } + else if (file != NULL && file != Py_None && !file_is_closed(file)) { + if (_PyFile_Flush(file) < 0) { status = -1; } } + if (status < 0) { + PyErr_FormatUnraisable("Exception ignored while flushing sys.stdout"); + } + Py_XDECREF(file); - if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) { - if (_PyFile_Flush(ferr) < 0) { + if (PySys_GetAttr(&_Py_ID(stderr), &file) < 0) { + PyErr_Clear(); + status = -1; + } + else if (file != NULL && file != Py_None && !file_is_closed(file)) { + if (_PyFile_Flush(file) < 0) { PyErr_Clear(); status = -1; } } + Py_XDECREF(file); return status; } @@ -2998,10 +3012,14 @@ _Py_FatalError_PrintExc(PyThreadState *tstate) return 0; } - PyObject *ferr = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + PyObject *ferr; + if (PySys_GetAttr(&_Py_ID(stderr), &ferr) < 0) { + _PyErr_Clear(tstate); + } if (ferr == NULL || ferr == Py_None) { /* sys.stderr is not set yet or set to None, no need to try to display the exception */ + Py_XDECREF(ferr); Py_DECREF(exc); return 0; } @@ -3017,6 +3035,7 @@ _Py_FatalError_PrintExc(PyThreadState *tstate) if (_PyFile_Flush(ferr) < 0) { _PyErr_Clear(tstate); } + Py_DECREF(ferr); return has_tb; } diff --git a/Python/pythonrun.c b/Python/pythonrun.c index ae0df9685ac159..8c21be3f95f4a8 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -23,7 +23,7 @@ #include "pycore_pylifecycle.h" // _Py_FdIsInteractive() #include "pycore_pystate.h" // _PyInterpreterState_GET() #include "pycore_pythonrun.h" // export _PyRun_InteractiveLoopObject() -#include "pycore_sysmodule.h" // _PySys_GetAttr() +#include "pycore_sysmodule.h" // _PySys_SetAttr() #include "pycore_traceback.h" // _PyTraceBack_Print() #include "errcode.h" // E_EOF @@ -110,17 +110,35 @@ _PyRun_InteractiveLoopObject(FILE *fp, PyObject *filename, PyCompilerFlags *flag flags = &local_flags; } - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *v = _PySys_GetAttr(tstate, &_Py_ID(ps1)); + PyObject *v; + if (PySys_GetAttr(&_Py_ID(ps1), &v) < 0) { + PyErr_Print(); + return -1; + } if (v == NULL) { - _PySys_SetAttr(&_Py_ID(ps1), v = PyUnicode_FromString(">>> ")); - Py_XDECREF(v); + v = PyUnicode_FromString(">>> "); + if (v == NULL) { + PyErr_Clear(); + } + if (_PySys_SetAttr(&_Py_ID(ps1), v) < 0) { + PyErr_Clear(); + } + } + Py_XDECREF(v); + if (PySys_GetAttr(&_Py_ID(ps2), &v) < 0) { + PyErr_Print(); + return -1; } - v = _PySys_GetAttr(tstate, &_Py_ID(ps2)); if (v == NULL) { - _PySys_SetAttr(&_Py_ID(ps2), v = PyUnicode_FromString("... ")); - Py_XDECREF(v); + v = PyUnicode_FromString("... "); + if (v == NULL) { + PyErr_Clear(); + } + if (_PySys_SetAttr(&_Py_ID(ps2), v) < 0) { + PyErr_Clear(); + } } + Py_XDECREF(v); #ifdef Py_REF_DEBUG int show_ref_count = _Py_GetConfig()->show_ref_count; @@ -180,31 +198,37 @@ pyrun_one_parse_ast(FILE *fp, PyObject *filename, PyCompilerFlags *flags, PyArena *arena, mod_ty *pmod, PyObject** interactive_src) { - PyThreadState *tstate = _PyThreadState_GET(); - // Get sys.stdin.encoding (as UTF-8) - PyObject *attr; // borrowed ref + PyObject *attr; PyObject *encoding_obj = NULL; const char *encoding = NULL; if (fp == stdin) { - attr = _PySys_GetAttr(tstate, &_Py_ID(stdin)); - if (attr && attr != Py_None) { - encoding_obj = PyObject_GetAttr(attr, &_Py_ID(encoding)); - if (encoding_obj) { + if (PySys_GetAttr(&_Py_ID(stdin), &attr) < 0) { + PyErr_Clear(); + } + else if (attr != NULL && attr != Py_None) { + if (PyObject_GetOptionalAttr(attr, &_Py_ID(encoding), &encoding_obj) < 0) { + PyErr_Clear(); + } + else if (encoding_obj && PyUnicode_Check(encoding_obj)) { encoding = PyUnicode_AsUTF8(encoding_obj); if (!encoding) { PyErr_Clear(); } } } + Py_XDECREF(attr); } // Get sys.ps1 (as UTF-8) - attr = _PySys_GetAttr(tstate, &_Py_ID(ps1)); PyObject *ps1_obj = NULL; const char *ps1 = ""; - if (attr != NULL) { + if (PySys_GetAttr(&_Py_ID(ps1), &attr) < 0) { + PyErr_Clear(); + } + else if (attr != NULL) { ps1_obj = PyObject_Str(attr); + Py_DECREF(attr); if (ps1_obj == NULL) { PyErr_Clear(); } @@ -218,11 +242,14 @@ pyrun_one_parse_ast(FILE *fp, PyObject *filename, } // Get sys.ps2 (as UTF-8) - attr = _PySys_GetAttr(tstate, &_Py_ID(ps2)); PyObject *ps2_obj = NULL; const char *ps2 = ""; - if (attr != NULL) { + if (PySys_GetAttr(&_Py_ID(ps2), &attr) < 0) { + PyErr_Clear(); + } + else if (attr != NULL) { ps2_obj = PyObject_Str(attr); + Py_DECREF(attr); if (ps2_obj == NULL) { PyErr_Clear(); } @@ -622,9 +649,11 @@ _Py_HandleSystemExit(int *exitcode_p) Py_SETREF(exc, code); } - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *sys_stderr = _PySys_GetAttr(tstate, &_Py_ID(stderr)); - if (sys_stderr != NULL && sys_stderr != Py_None) { + PyObject *sys_stderr; + if (PySys_GetAttr(&_Py_ID(stderr), &sys_stderr) < 0) { + PyErr_Clear(); + } + else if (sys_stderr != NULL && sys_stderr != Py_None) { if (PyFile_WriteObject(exc, sys_stderr, Py_PRINT_RAW) < 0) { PyErr_Clear(); } @@ -636,6 +665,7 @@ _Py_HandleSystemExit(int *exitcode_p) fflush(stderr); } PySys_WriteStderr("\n"); + Py_XDECREF(sys_stderr); Py_CLEAR(exc); *exitcode_p = 1; return 1; @@ -655,7 +685,7 @@ handle_system_exit(void) static void _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars) { - PyObject *typ = NULL, *tb = NULL; + PyObject *typ = NULL, *tb = NULL, *hook = NULL; handle_system_exit(); PyObject *exc = _PyErr_GetRaisedException(tstate); @@ -684,7 +714,9 @@ _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars) _PyErr_Clear(tstate); } } - PyObject *hook = _PySys_GetAttr(tstate, &_Py_ID(excepthook)); + if (PySys_GetAttr(&_Py_ID(excepthook), &hook) < 0) { + PyErr_Clear(); + } if (_PySys_Audit(tstate, "sys.excepthook", "OOOO", hook ? hook : Py_None, typ, exc, tb) < 0) { if (PyErr_ExceptionMatches(PyExc_RuntimeError)) { @@ -718,6 +750,7 @@ _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars) } done: + Py_XDECREF(hook); Py_XDECREF(typ); Py_XDECREF(exc); Py_XDECREF(tb); @@ -1159,17 +1192,24 @@ _PyErr_Display(PyObject *file, PyObject *unused, PyObject *value, PyObject *tb) void PyErr_Display(PyObject *unused, PyObject *value, PyObject *tb) { - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *file = _PySys_GetAttr(tstate, &_Py_ID(stderr)); + PyObject *file; + if (PySys_GetAttr(&_Py_ID(stderr), &file) < 0) { + PyObject *exc = PyErr_GetRaisedException(); + _PyObject_Dump(value); + fprintf(stderr, "lost sys.stderr\n"); + _PyObject_Dump(exc); + Py_DECREF(exc); + return; + } if (file == NULL) { _PyObject_Dump(value); fprintf(stderr, "lost sys.stderr\n"); return; } if (file == Py_None) { + Py_DECREF(file); return; } - Py_INCREF(file); _PyErr_Display(file, NULL, value, tb); Py_DECREF(file); } @@ -1276,11 +1316,15 @@ PyRun_FileExFlags(FILE *fp, const char *filename, int start, PyObject *globals, static void flush_io_stream(PyThreadState *tstate, PyObject *name) { - PyObject *f = _PySys_GetAttr(tstate, name); + PyObject *f; + if (PySys_GetAttr(name, &f) < 0) { + PyErr_Clear(); + } if (f != NULL) { if (_PyFile_Flush(f) < 0) { PyErr_Clear(); } + Py_DECREF(f); } } diff --git a/Python/sysmodule.c b/Python/sysmodule.c index d5cb448eb618e8..1c397fb11f0ef5 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -72,48 +72,92 @@ module sys PyObject * -_PySys_GetAttr(PyThreadState *tstate, PyObject *name) +_PySys_GetRequiredAttr(PyObject *name) { - PyObject *sd = tstate->interp->sysdict; - if (sd == NULL) { + if (!PyUnicode_Check(name)) { + PyErr_Format(PyExc_TypeError, + "attribute name must be string, not '%.200s'", + Py_TYPE(name)->tp_name); return NULL; } - PyObject *exc = _PyErr_GetRaisedException(tstate); - /* XXX Suppress a new exception if it was raised and restore - * the old one. */ - PyObject *value = _PyDict_GetItemWithError(sd, name); - _PyErr_SetRaisedException(tstate, exc); + PyThreadState *tstate = _PyThreadState_GET(); + PyObject *sysdict = tstate->interp->sysdict; + if (sysdict == NULL) { + PyErr_SetString(PyExc_RuntimeError, "no sys module"); + return NULL; + } + PyObject *value; + if (PyDict_GetItemRef(sysdict, name, &value) == 0) { + PyErr_Format(PyExc_RuntimeError, "lost sys.%S", name); + } return value; } -static PyObject * -_PySys_GetObject(PyInterpreterState *interp, const char *name) +PyObject * +_PySys_GetRequiredAttrString(const char *name) { - PyObject *sysdict = interp->sysdict; + PyThreadState *tstate = _PyThreadState_GET(); + PyObject *sysdict = tstate->interp->sysdict; if (sysdict == NULL) { + PyErr_SetString(PyExc_RuntimeError, "no sys module"); return NULL; } PyObject *value; - if (PyDict_GetItemStringRef(sysdict, name, &value) != 1) { - return NULL; + if (PyDict_GetItemStringRef(sysdict, name, &value) == 0) { + PyErr_Format(PyExc_RuntimeError, "lost sys.%s", name); } - Py_DECREF(value); // return a borrowed reference return value; } +int +PySys_GetAttr(PyObject *name, PyObject **value) +{ + if (!PyUnicode_Check(name)) { + PyErr_Format(PyExc_TypeError, + "attribute name must be string, not '%.200s'", + Py_TYPE(name)->tp_name); + *value = NULL; + return -1; + } + PyThreadState *tstate = _PyThreadState_GET(); + PyObject *sysdict = tstate->interp->sysdict; + if (sysdict == NULL) { + *value = NULL; + return 0; + } + return PyDict_GetItemRef(sysdict, name, value); +} + +int +PySys_GetAttrString(const char *name, PyObject **value) +{ + PyThreadState *tstate = _PyThreadState_GET(); + PyObject *sysdict = tstate->interp->sysdict; + if (sysdict == NULL) { + *value = NULL; + return 0; + } + return PyDict_GetItemStringRef(sysdict, name, value); +} + PyObject * PySys_GetObject(const char *name) { PyThreadState *tstate = _PyThreadState_GET(); - + PyObject *sysdict = tstate->interp->sysdict; + if (sysdict == NULL) { + return NULL; + } PyObject *exc = _PyErr_GetRaisedException(tstate); - PyObject *value = _PySys_GetObject(tstate->interp, name); + PyObject *value; + (void) PyDict_GetItemStringRef(sysdict, name, &value); /* XXX Suppress a new exception if it was raised and restore * the old one. */ if (_PyErr_Occurred(tstate)) { PyErr_FormatUnraisable("Exception ignored in PySys_GetObject()"); } _PyErr_SetRaisedException(tstate, exc); + Py_XDECREF(value); // return a borrowed reference return value; } @@ -124,6 +168,10 @@ sys_set_object(PyInterpreterState *interp, PyObject *key, PyObject *v) return -1; } PyObject *sd = interp->sysdict; + if (sd == NULL) { + PyErr_SetString(PyExc_RuntimeError, "no sys module"); + return -1; + } if (v == NULL) { if (PyDict_Pop(sd, key, NULL) < 0) { return -1; @@ -721,9 +769,13 @@ sys_displayhook(PyObject *module, PyObject *o) } if (PyObject_SetAttr(builtins, _Py_LATIN1_CHR('_'), Py_None) != 0) return NULL; - outf = _PySys_GetAttr(tstate, &_Py_ID(stdout)); - if (outf == NULL || outf == Py_None) { + outf = _PySys_GetRequiredAttr(&_Py_ID(stdout)); + if (outf == NULL) { + return NULL; + } + if (outf == Py_None) { _PyErr_SetString(tstate, PyExc_RuntimeError, "lost sys.stdout"); + Py_DECREF(outf); return NULL; } if (PyFile_WriteObject(o, outf, 0) != 0) { @@ -734,17 +786,23 @@ sys_displayhook(PyObject *module, PyObject *o) _PyErr_Clear(tstate); err = sys_displayhook_unencodable(outf, o); if (err) { + Py_DECREF(outf); return NULL; } } else { + Py_DECREF(outf); return NULL; } } - if (PyFile_WriteObject(_Py_LATIN1_CHR('\n'), outf, Py_PRINT_RAW) != 0) + if (PyFile_WriteObject(_Py_LATIN1_CHR('\n'), outf, Py_PRINT_RAW) != 0) { + Py_DECREF(outf); return NULL; - if (PyObject_SetAttr(builtins, _Py_LATIN1_CHR('_'), o) != 0) + } + Py_DECREF(outf); + if (PyObject_SetAttr(builtins, _Py_LATIN1_CHR('_'), o) != 0) { return NULL; + } Py_RETURN_NONE; } @@ -2822,7 +2880,10 @@ _PySys_ReadPreinitXOptions(PyConfig *config) static PyObject * get_warnoptions(PyThreadState *tstate) { - PyObject *warnoptions = _PySys_GetAttr(tstate, &_Py_ID(warnoptions)); + PyObject *warnoptions; + if (PySys_GetAttr(&_Py_ID(warnoptions), &warnoptions) < 0) { + return NULL; + } if (warnoptions == NULL || !PyList_Check(warnoptions)) { /* PEP432 TODO: we can reach this if warnoptions is NULL in the main * interpreter config. When that happens, we need to properly set @@ -2834,6 +2895,7 @@ get_warnoptions(PyThreadState *tstate) * call optional for embedding applications, thus making this * reachable again. */ + Py_XDECREF(warnoptions); warnoptions = PyList_New(0); if (warnoptions == NULL) { return NULL; @@ -2842,7 +2904,6 @@ get_warnoptions(PyThreadState *tstate) Py_DECREF(warnoptions); return NULL; } - Py_DECREF(warnoptions); } return warnoptions; } @@ -2856,10 +2917,15 @@ PySys_ResetWarnOptions(void) return; } - PyObject *warnoptions = _PySys_GetAttr(tstate, &_Py_ID(warnoptions)); - if (warnoptions == NULL || !PyList_Check(warnoptions)) + PyObject *warnoptions; + if (PySys_GetAttr(&_Py_ID(warnoptions), &warnoptions) < 0) { + PyErr_Clear(); return; - PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL); + } + if (warnoptions != NULL && PyList_Check(warnoptions)) { + PyList_SetSlice(warnoptions, 0, PyList_GET_SIZE(warnoptions), NULL); + } + Py_XDECREF(warnoptions); } static int @@ -2871,8 +2937,10 @@ _PySys_AddWarnOptionWithError(PyThreadState *tstate, PyObject *option) return -1; } if (PyList_Append(warnoptions, option)) { + Py_DECREF(warnoptions); return -1; } + Py_DECREF(warnoptions); return 0; } @@ -2913,16 +2981,24 @@ _Py_COMP_DIAG_POP PyAPI_FUNC(int) PySys_HasWarnOptions(void) { - PyThreadState *tstate = _PyThreadState_GET(); - PyObject *warnoptions = _PySys_GetAttr(tstate, &_Py_ID(warnoptions)); - return (warnoptions != NULL && PyList_Check(warnoptions) - && PyList_GET_SIZE(warnoptions) > 0); + PyObject *warnoptions; + if (PySys_GetAttr(&_Py_ID(warnoptions), &warnoptions) < 0) { + PyErr_Clear(); + return 0; + } + int r = (warnoptions != NULL && PyList_Check(warnoptions) && + PyList_GET_SIZE(warnoptions) > 0); + Py_XDECREF(warnoptions); + return r; } static PyObject * get_xoptions(PyThreadState *tstate) { - PyObject *xoptions = _PySys_GetAttr(tstate, &_Py_ID(_xoptions)); + PyObject *xoptions; + if (PySys_GetAttr(&_Py_ID(_xoptions), &xoptions) < 0) { + return NULL; + } if (xoptions == NULL || !PyDict_Check(xoptions)) { /* PEP432 TODO: we can reach this if xoptions is NULL in the main * interpreter config. When that happens, we need to properly set @@ -2934,6 +3010,7 @@ get_xoptions(PyThreadState *tstate) * call optional for embedding applications, thus making this * reachable again. */ + Py_XDECREF(xoptions); xoptions = PyDict_New(); if (xoptions == NULL) { return NULL; @@ -2942,7 +3019,6 @@ get_xoptions(PyThreadState *tstate) Py_DECREF(xoptions); return NULL; } - Py_DECREF(xoptions); } return xoptions; } @@ -2981,11 +3057,13 @@ _PySys_AddXOptionWithError(const wchar_t *s) } Py_DECREF(name); Py_DECREF(value); + Py_DECREF(opts); return 0; error: Py_XDECREF(name); Py_XDECREF(value); + Py_XDECREF(opts); return -1; } @@ -3008,7 +3086,9 @@ PyObject * PySys_GetXOptions(void) { PyThreadState *tstate = _PyThreadState_GET(); - return get_xoptions(tstate); + PyObject *opts = get_xoptions(tstate); + Py_XDECREF(opts); + return opts; } /* XXX This doc string is too long to be a single string literal in VC++ 5.0. @@ -3167,11 +3247,8 @@ sys_set_flag(PyObject *flags, Py_ssize_t pos, PyObject *value) int _PySys_SetFlagObj(Py_ssize_t pos, PyObject *value) { - PyObject *flags = Py_XNewRef(PySys_GetObject("flags")); + PyObject *flags = _PySys_GetRequiredAttrString("flags"); if (flags == NULL) { - if (!PyErr_Occurred()) { - PyErr_SetString(PyExc_RuntimeError, "lost sys.flags"); - } return -1; } @@ -3730,16 +3807,15 @@ _PySys_UpdateConfig(PyThreadState *tstate) #undef COPY_WSTR // sys.flags - PyObject *flags = _PySys_GetObject(interp, "flags"); // borrowed ref + PyObject *flags = _PySys_GetRequiredAttrString("flags"); if (flags == NULL) { - if (!_PyErr_Occurred(tstate)) { - _PyErr_SetString(tstate, PyExc_RuntimeError, "lost sys.flags"); - } return -1; } if (set_flags_from_config(interp, flags) < 0) { + Py_DECREF(flags); return -1; } + Py_DECREF(flags); SET_SYS("dont_write_bytecode", PyBool_FromLong(!config->write_bytecode)); @@ -3971,12 +4047,15 @@ PySys_SetArgvEx(int argc, wchar_t **argv, int updatepath) Py_FatalError("can't compute path0 from argv"); } - PyObject *sys_path = _PySys_GetAttr(tstate, &_Py_ID(path)); - if (sys_path != NULL) { + PyObject *sys_path; + if (PySys_GetAttr(&_Py_ID(path), &sys_path) < 0) { + Py_FatalError("can't get sys.path"); + } + else if (sys_path != NULL) { if (PyList_Insert(sys_path, 0, path0) < 0) { - Py_DECREF(path0); Py_FatalError("can't prepend path0 to sys.path"); } + Py_DECREF(sys_path); } Py_DECREF(path0); } @@ -4064,8 +4143,8 @@ sys_write(PyObject *key, FILE *fp, const char *format, va_list va) PyThreadState *tstate = _PyThreadState_GET(); PyObject *exc = _PyErr_GetRaisedException(tstate); - file = _PySys_GetAttr(tstate, key); written = PyOS_vsnprintf(buffer, sizeof(buffer), format, va); + file = _PySys_GetRequiredAttr(key); if (sys_pyfile_write(buffer, file) != 0) { _PyErr_Clear(tstate); fputs(buffer, fp); @@ -4075,6 +4154,7 @@ sys_write(PyObject *key, FILE *fp, const char *format, va_list va) if (sys_pyfile_write(truncated, file) != 0) fputs(truncated, fp); } + Py_XDECREF(file); _PyErr_SetRaisedException(tstate, exc); } @@ -4106,15 +4186,16 @@ sys_format(PyObject *key, FILE *fp, const char *format, va_list va) PyThreadState *tstate = _PyThreadState_GET(); PyObject *exc = _PyErr_GetRaisedException(tstate); - file = _PySys_GetAttr(tstate, key); message = PyUnicode_FromFormatV(format, va); if (message != NULL) { + file = _PySys_GetRequiredAttr(key); if (sys_pyfile_write_unicode(message, file) != 0) { _PyErr_Clear(tstate); utf8 = PyUnicode_AsUTF8(message); if (utf8 != NULL) fputs(utf8, fp); } + Py_XDECREF(file); Py_DECREF(message); } _PyErr_SetRaisedException(tstate, exc); diff --git a/Python/traceback.c b/Python/traceback.c index 870ae5bcefe9eb..585fcdfa9c5ca5 100644 --- a/Python/traceback.c +++ b/Python/traceback.c @@ -12,7 +12,6 @@ #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_traceback.h" // EXCEPTION_TB_HEADER #include "frameobject.h" // PyFrame_New() @@ -356,9 +355,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_GetAttr(&_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)); @@ -401,6 +404,7 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf, size_t namelen, PyObject * result = NULL; finally: Py_XDECREF(open); + Py_XDECREF(syspath); Py_DECREF(filebytes); return result; } @@ -729,17 +733,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_GetAttrString("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; From e407aa32c31e2f271ddecfcb283afc63d7549ec7 Mon Sep 17 00:00:00 2001 From: Serhiy Storchaka Date: Tue, 25 Feb 2025 23:24:38 +0200 Subject: [PATCH 2/2] Remove Include/cpython/sysmodule.h. --- Include/cpython/sysmodule.h | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Include/cpython/sysmodule.h diff --git a/Include/cpython/sysmodule.h b/Include/cpython/sysmodule.h deleted file mode 100644 index df12ae440f024b..00000000000000 --- a/Include/cpython/sysmodule.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef Py_CPYTHON_SYSMODULE_H -# error "this header file must not be included directly" -#endif - -typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *); - -PyAPI_FUNC(int) PySys_Audit( - const char *event, - const char *format, - ...); -PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*); - -typedef struct { - FILE* perf_map; - PyThread_type_lock map_lock; -} PerfMapState; - -PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void); -PyAPI_FUNC(int) PyUnstable_WritePerfMapEntry( - const void *code_addr, - unsigned int code_size, - const char *entry_name); -PyAPI_FUNC(void) PyUnstable_PerfMapState_Fini(void);