https://github.com/python/cpython/commit/7c1b76fce8c8df00da38830f72dbdde6881a33be
commit: 7c1b76fce8c8df00da38830f72dbdde6881a33be
branch: 3.13
author: Serhiy Storchaka <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2025-02-25T22:50:26Z
summary:
[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)
files:
A Misc/NEWS.d/next/Core and
Builtins/2025-02-24-14-25-36.gh-issue-130163.rGpc9v.rst
M Include/internal/pycore_sysmodule.h
M Lib/test/test_builtin.py
M Lib/test/test_print.py
M Lib/test/test_sys.py
M Modules/_cursesmodule.c
M Modules/_pickle.c
M Modules/_threadmodule.c
M Modules/_tkinter.c
M Modules/faulthandler.c
M Modules/syslogmodule.c
M Objects/moduleobject.c
M Python/_warnings.c
M Python/bltinmodule.c
M Python/ceval.c
M Python/errors.c
M Python/import.c
M Python/initconfig.c
M Python/intrinsics.c
M Python/pylifecycle.c
M Python/pythonrun.c
M Python/sysmodule.c
M Python/traceback.c
diff --git a/Include/internal/pycore_sysmodule.h
b/Include/internal/pycore_sysmodule.h
index 9b8eafd3d6cfd3..6df574487bcd1b 100644
--- a/Include/internal/pycore_sysmodule.h
+++ b/Include/internal/pycore_sysmodule.h
@@ -8,8 +8,11 @@ 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_GetAttr(PyThreadState *, PyObject *); /* unused
*/
+PyAPI_FUNC(int) _PySys_GetOptionalAttr(PyObject *, PyObject **);
+PyAPI_FUNC(int) _PySys_GetOptionalAttrString(const char *, PyObject **);
+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/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 3a5531924976f7..d4da29150d5fed 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -1576,6 +1576,29 @@ def test_input(self):
sys.stdout = savestdout
fp.close()
+ def test_input_gh130163(self):
+ class X(io.StringIO):
+ def __getattribute__(self, name):
+ nonlocal patch
+ if patch:
+ patch = False
+ sys.stdout = X()
+ sys.stderr = X()
+ sys.stdin = X('input\n')
+ support.gc_collect()
+ return io.StringIO.__getattribute__(self, name)
+
+ with (support.swap_attr(sys, 'stdout', None),
+ support.swap_attr(sys, 'stderr', None),
+ support.swap_attr(sys, 'stdin', None)):
+ patch = False
+ # the only references:
+ sys.stdout = X()
+ sys.stderr = X()
+ sys.stdin = X('input\n')
+ patch = True
+ input() # should not crash
+
# test_int(): see test_int.py for tests of built-in function int().
def test_repr(self):
diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py
index 5f1bfd9e30db98..a782225ce99971 100644
--- a/Lib/test/test_print.py
+++ b/Lib/test/test_print.py
@@ -129,6 +129,17 @@ def flush(self):
raise RuntimeError
self.assertRaises(RuntimeError, print, 1, file=noflush(), flush=True)
+ def test_gh130163(self):
+ class X:
+ def __str__(self):
+ sys.stdout = StringIO()
+ support.gc_collect()
+ return 'foo'
+
+ with support.swap_attr(sys, 'stdout', None):
+ sys.stdout = StringIO() # the only reference
+ print(X()) # should not crash
+
class TestPy2MigrationHint(unittest.TestCase):
"""Test that correct hint is produced analogous to Python3 syntax,
diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py
index 01ce0118651b75..19597eb75f9168 100644
--- a/Lib/test/test_sys.py
+++ b/Lib/test/test_sys.py
@@ -2,6 +2,7 @@
import codecs
import _datetime
import gc
+import io
import locale
import operator
import os
@@ -80,6 +81,18 @@ def baddisplayhook(obj):
code = compile("42", "<string>", "single")
self.assertRaises(ValueError, eval, code)
+ def test_gh130163(self):
+ class X:
+ def __repr__(self):
+ sys.stdout = io.StringIO()
+ support.gc_collect()
+ return 'foo'
+
+ with support.swap_attr(sys, 'stdout', None):
+ sys.stdout = io.StringIO() # the only reference
+ sys.displayhook(X()) # should not crash
+
+
class ActiveExceptionTests(unittest.TestCase):
def test_exc_info_no_exception(self):
self.assertEqual(sys.exc_info(), (None, None, None))
diff --git a/Misc/NEWS.d/next/Core and
Builtins/2025-02-24-14-25-36.gh-issue-130163.rGpc9v.rst b/Misc/NEWS.d/next/Core
and Builtins/2025-02-24-14-25-36.gh-issue-130163.rGpc9v.rst
new file mode 100644
index 00000000000000..590a3fa437b936
--- /dev/null
+++ b/Misc/NEWS.d/next/Core and
Builtins/2025-02-24-14-25-36.gh-issue-130163.rGpc9v.rst
@@ -0,0 +1,2 @@
+Fix possible crashes related to concurrent
+change and use of the :mod:`sys` module attributes.
diff --git a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
index a7cbe81226eb19..02b04645036d72 100644
--- a/Modules/_cursesmodule.c
+++ b/Modules/_cursesmodule.c
@@ -107,6 +107,7 @@ static const char PyCursesVersion[] = "2.2";
#include "Python.h"
#include "pycore_long.h" // _PyLong_GetZero()
#include "pycore_structseq.h" // _PyStructSequence_NewType()
+#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
#ifdef __hpux
#define STRICT_SYSV_CURSES
@@ -3375,17 +3376,20 @@ _curses_setupterm_impl(PyObject *module, const char
*term, int fd)
if (fd == -1) {
PyObject* sys_stdout;
- sys_stdout = PySys_GetObject("stdout");
+ if (_PySys_GetOptionalAttrString("stdout", &sys_stdout) < 0) {
+ return NULL;
+ }
if (sys_stdout == NULL || sys_stdout == Py_None) {
PyErr_SetString(
PyCursesError,
"lost sys.stdout");
+ Py_XDECREF(sys_stdout);
return NULL;
}
fd = PyObject_AsFileDescriptor(sys_stdout);
-
+ Py_DECREF(sys_stdout);
if (fd == -1) {
return NULL;
}
diff --git a/Modules/_pickle.c b/Modules/_pickle.c
index 83c4ba6087e620..edb2c116585880 100644
--- a/Modules/_pickle.c
+++ b/Modules/_pickle.c
@@ -18,7 +18,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 <stdlib.h> // strtol()
@@ -1930,10 +1930,8 @@ whichmodule(PyObject *global, PyObject *dotted_path)
assert(module_name == NULL);
/* Fallback on walking sys.modules */
- 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)) {
diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c
index 1e63a50483b846..2853f3d26773d0 100644
--- a/Modules/_threadmodule.c
+++ b/Modules/_threadmodule.c
@@ -8,7 +8,7 @@
#include "pycore_modsupport.h" // _PyArg_NoKeywords()
#include "pycore_pylifecycle.h"
#include "pycore_pystate.h" // _PyThreadState_SetCurrent()
-#include "pycore_sysmodule.h" // _PySys_GetAttr()
+#include "pycore_sysmodule.h" // _PySys_GetOptionalAttr()
#include "pycore_time.h" // _PyTime_FromSeconds()
#include "pycore_weakref.h" // _PyWeakref_GET_REF()
@@ -2275,9 +2275,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_GetOptionalAttr( &_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;
@@ -2294,9 +2297,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 a2f0cf2b01acc4..487bde30f40f41 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_GetOptionalAttrString()
#ifdef MS_WINDOWS
# include <windows.h>
@@ -142,8 +143,9 @@ _get_tcl_lib_path(void)
if (already_checked == 0) {
struct stat stat_buf;
int stat_return_value;
+ PyObject *prefix;
- PyObject *prefix = PySys_GetObject("base_prefix"); // borrowed
reference
+ (void) _PySys_GetOptionalAttrString("base_prefix", &prefix);
if (prefix == NULL) {
return NULL;
}
@@ -151,9 +153,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;
}
@@ -3485,9 +3489,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
+ (void) _PySys_GetOptionalAttrString("executable", &uexe);
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;
@@ -3500,12 +3505,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;
}
@@ -3526,6 +3533,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 d2ff555434cfc1..5a4efed9946fba 100644
--- a/Modules/faulthandler.c
+++ b/Modules/faulthandler.c
@@ -3,7 +3,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
@@ -109,14 +109,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;
}
}
@@ -139,10 +138,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)) {
@@ -155,6 +159,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;
}
@@ -234,8 +239,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();
@@ -246,12 +253,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;
@@ -513,10 +522,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;
@@ -706,12 +716,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();
}
@@ -723,6 +735,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);
@@ -730,7 +743,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 */
@@ -892,14 +904,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
@@ -907,13 +922,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/syslogmodule.c b/Modules/syslogmodule.c
index aa1bc9da91dfb9..9c54af51402a27 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_GetOptionalAttrString()
#include <syslog.h>
@@ -89,45 +90,50 @@ syslog_get_argv(void)
Py_ssize_t argv_len, scriptlen;
PyObject *scriptobj;
Py_ssize_t slash;
- PyObject *argv = PySys_GetObject("argv");
+ PyObject *argv;
- if (argv == NULL) {
- return(NULL);
+ if (_PySys_GetOptionalAttrString("argv", &argv) <= 0) {
+ 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;
}
@@ -162,6 +168,9 @@ syslog_openlog_impl(PyObject *module, PyObject *ident, long
logopt,
else {
/* get sys.argv[0] or NULL if we can't for some reason */
ident = syslog_get_argv();
+ if (ident == NULL && PyErr_Occurred()) {
+ return NULL;
+ }
}
/* At this point, ident should be INCREF()ed. openlog(3) does not
diff --git a/Objects/moduleobject.c b/Objects/moduleobject.c
index a9065325af5718..41133cb7ede22a 100644
--- a/Objects/moduleobject.c
+++ b/Objects/moduleobject.c
@@ -10,6 +10,7 @@
#include "pycore_object.h" // _PyType_AllocNoTrack
#include "pycore_pyerrors.h" // _PyErr_FormatFromCause()
#include "pycore_pystate.h" // _PyInterpreterState_GET()
+#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
#include "osdefs.h" // MAXPATHLEN
@@ -990,13 +991,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_GetOptionalAttrString("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/Python/_warnings.c b/Python/_warnings.c
index 17404d33c1cc9b..4bb83b214ae6cc 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_GetOptionalAttr()
#include "pycore_traceback.h" // _Py_DisplaySourceLine()
#include <stdbool.h>
@@ -494,7 +494,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];
@@ -505,8 +505,7 @@ show_warning(PyThreadState *tstate, PyObject *filename, int
lineno,
goto error;
}
- f_stderr = _PySys_GetAttr(tstate, &_Py_ID(stderr));
- if (f_stderr == NULL) {
+ if (_PySys_GetOptionalAttr(&_Py_ID(stderr), &f_stderr) <= 0) {
fprintf(stderr, "lost sys.stderr\n");
goto error;
}
@@ -556,6 +555,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 5afa94cf2217d7..29d4d10f1e41d2 100644
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -11,7 +11,7 @@
#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_sysmodule.h" // _PySys_GetRequiredAttr()
#include "pycore_tuple.h" // _PyTuple_FromArray()
#include "clinic/bltinmodule.c.h"
@@ -457,18 +457,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;
@@ -2063,18 +2061,20 @@ builtin_print_impl(PyObject *module, PyObject *args,
PyObject *sep,
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;
@@ -2083,6 +2083,7 @@ builtin_print_impl(PyObject *module, PyObject *args,
PyObject *sep,
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) {
@@ -2092,6 +2093,7 @@ builtin_print_impl(PyObject *module, PyObject *args,
PyObject *sep,
PyErr_Format(PyExc_TypeError,
"end must be None or a string, not %.200s",
Py_TYPE(end)->tp_name);
+ Py_DECREF(file);
return NULL;
}
@@ -2104,11 +2106,13 @@ builtin_print_impl(PyObject *module, PyObject *args,
PyObject *sep,
err = PyFile_WriteObject(sep, file, Py_PRINT_RAW);
}
if (err) {
+ Py_DECREF(file);
return NULL;
}
}
err = PyFile_WriteObject(PyTuple_GET_ITEM(args, i), file,
Py_PRINT_RAW);
if (err) {
+ Py_DECREF(file);
return NULL;
}
}
@@ -2120,14 +2124,17 @@ builtin_print_impl(PyObject *module, PyObject *args,
PyObject *sep,
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;
}
@@ -2152,36 +2159,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 */
@@ -2200,8 +2212,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) {
@@ -2214,7 +2227,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);
}
}
@@ -2342,10 +2355,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:
@@ -2355,7 +2371,7 @@ builtin_input_impl(PyObject *module, PyObject *prompt)
Py_XDECREF(stdout_errors);
Py_XDECREF(po);
if (tty)
- return NULL;
+ goto error;
PyErr_Clear();
}
@@ -2363,12 +2379,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 763c8688266f9d..d5a08a38f0ada9 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -32,6 +32,7 @@
#include "pycore_typeobject.h" // _PySuper_Lookup()
#include "pycore_uop_ids.h" // Uops
#include "pycore_pyerrors.h"
+#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
#include "pycore_dict.h"
#include "dictobject.h"
@@ -2805,13 +2806,18 @@ import_from(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_GetOptionalAttrString("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 f19c030b1be114..bf5aacf6e8b62a 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1530,14 +1530,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_GetOptionalAttr(&_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);
@@ -1636,13 +1637,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_GetOptionalAttr(&_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;
@@ -1650,11 +1658,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 755a6e45e6afa3..23399f26fe2a93 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -3341,19 +3341,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);
@@ -3655,15 +3651,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_GetOptionalAttrString("path", &sys_path) < 0) {
+ return NULL;
+ }
+ if (_PySys_GetOptionalAttrString("meta_path", &sys_meta_path) < 0) {
+ Py_XDECREF(sys_path);
+ return NULL;
+ }
+ if (_PySys_GetOptionalAttrString("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.
@@ -4111,10 +4123,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;
}
@@ -4134,12 +4144,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 d6b0e3211a084c..9b446eccab9a57 100644
--- a/Python/initconfig.c
+++ b/Python/initconfig.c
@@ -10,6 +10,7 @@
#include "pycore_pymem.h" // _PyMem_SetDefaultAllocator()
#include "pycore_pystate.h" // _PyThreadState_GET()
#include "pycore_pystats.h" // _Py_StatsOn()
+#include "pycore_sysmodule.h" // _PySys_GetOptionalAttrString()
#include "osdefs.h" // DELIM
@@ -3232,10 +3233,13 @@ _Py_DumpPathConfig(PyThreadState *tstate)
#define DUMP_SYS(NAME) \
do { \
- obj = PySys_GetObject(#NAME); \
PySys_FormatStderr(" sys.%s = ", #NAME); \
+ if (_PySys_GetOptionalAttrString(#NAME, &obj) < 0) { \
+ PyErr_Clear(); \
+ } \
if (obj != NULL) { \
PySys_FormatStderr("%A", obj); \
+ Py_DECREF(obj); \
} \
else { \
PySys_WriteStderr("(not set)"); \
@@ -3253,7 +3257,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_GetOptionalAttrString("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);
@@ -3263,6 +3268,7 @@ _Py_DumpPathConfig(PyThreadState *tstate)
}
PySys_WriteStderr(" ]\n");
}
+ Py_XDECREF(sys_path);
_PyErr_SetRaisedException(tstate, exc);
}
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 ba835ef4c848e8..c96455e65aa3ba 100644
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -1300,8 +1300,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_GetOptionalAttrString("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) {
@@ -1310,6 +1314,7 @@ init_interp_main(PyThreadState *tstate)
}
Py_XDECREF(warnings_module);
}
+ Py_XDECREF(warnoptions);
interp->runtime->initialized = 1;
}
@@ -1820,24 +1825,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 on flushing sys.stdout");
+ if (_PySys_GetOptionalAttr(&_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 on flushing sys.stdout");
+ }
+ Py_XDECREF(file);
- if (ferr != NULL && ferr != Py_None && !file_is_closed(ferr)) {
- if (_PyFile_Flush(ferr) < 0) {
+ if (_PySys_GetOptionalAttr(&_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;
}
@@ -3048,10 +3062,14 @@ _Py_FatalError_PrintExc(PyThreadState *tstate)
return 0;
}
- PyObject *ferr = _PySys_GetAttr(tstate, &_Py_ID(stderr));
+ PyObject *ferr;
+ if (_PySys_GetOptionalAttr(&_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;
}
@@ -3067,6 +3085,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 f9daf8168f1c52..2092f3adf0c9ec 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -109,17 +109,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_GetOptionalAttr(&_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_GetOptionalAttr(&_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;
@@ -179,31 +197,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_GetOptionalAttr(&_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_GetOptionalAttr(&_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();
}
@@ -217,11 +241,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_GetOptionalAttr(&_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();
}
@@ -621,9 +648,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_GetOptionalAttr(&_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();
}
@@ -635,6 +664,7 @@ _Py_HandleSystemExit(int *exitcode_p)
fflush(stderr);
}
PySys_WriteStderr("\n");
+ Py_XDECREF(sys_stderr);
Py_CLEAR(exc);
*exitcode_p = 1;
return 1;
@@ -654,7 +684,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);
@@ -683,7 +713,9 @@ _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars)
_PyErr_Clear(tstate);
}
}
- PyObject *hook = _PySys_GetAttr(tstate, &_Py_ID(excepthook));
+ if (_PySys_GetOptionalAttr(&_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)) {
@@ -717,6 +749,7 @@ _PyErr_PrintEx(PyThreadState *tstate, int set_sys_last_vars)
}
done:
+ Py_XDECREF(hook);
Py_XDECREF(typ);
Py_XDECREF(exc);
Py_XDECREF(tb);
@@ -1165,17 +1198,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_GetOptionalAttr(&_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);
}
@@ -1282,11 +1322,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_GetOptionalAttr(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 9cf4a580d4408f..5095d7bdb55a1c 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -85,34 +85,93 @@ _PySys_GetAttr(PyThreadState *tstate, PyObject *name)
return value;
}
-static PyObject *
-_PySys_GetObject(PyInterpreterState *interp, const char *name)
+ PyObject *
+_PySys_GetRequiredAttr(PyObject *name)
{
- PyObject *sysdict = interp->sysdict;
+ if (!PyUnicode_Check(name)) {
+ PyErr_Format(PyExc_TypeError,
+ "attribute name must be string, not '%.200s'",
+ Py_TYPE(name)->tp_name);
+ return NULL;
+ }
+ 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) {
+ if (PyDict_GetItemRef(sysdict, name, &value) == 0) {
+ PyErr_Format(PyExc_RuntimeError, "lost sys.%U", name);
+ }
+ return value;
+}
+
+PyObject *
+_PySys_GetRequiredAttrString(const char *name)
+{
+ PyThreadState *tstate = _PyThreadState_GET();
+ PyObject *sysdict = tstate->interp->sysdict;
+ if (sysdict == NULL) {
+ PyErr_SetString(PyExc_RuntimeError, "no sys module");
return NULL;
}
- Py_DECREF(value); // return a borrowed reference
+ PyObject *value;
+ if (PyDict_GetItemStringRef(sysdict, name, &value) == 0) {
+ PyErr_Format(PyExc_RuntimeError, "lost sys.%s", name);
+ }
return value;
}
+int
+_PySys_GetOptionalAttr(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_GetOptionalAttrString(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;
}
@@ -123,6 +182,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;
@@ -748,9 +811,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) {
@@ -761,17 +828,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;
}
@@ -2798,7 +2871,10 @@ _PySys_ReadPreinitXOptions(PyConfig *config)
static PyObject *
get_warnoptions(PyThreadState *tstate)
{
- PyObject *warnoptions = _PySys_GetAttr(tstate, &_Py_ID(warnoptions));
+ PyObject *warnoptions;
+ if (_PySys_GetOptionalAttr(&_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
@@ -2810,6 +2886,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;
@@ -2818,7 +2895,6 @@ get_warnoptions(PyThreadState *tstate)
Py_DECREF(warnoptions);
return NULL;
}
- Py_DECREF(warnoptions);
}
return warnoptions;
}
@@ -2832,10 +2908,15 @@ PySys_ResetWarnOptions(void)
return;
}
- PyObject *warnoptions = _PySys_GetAttr(tstate, &_Py_ID(warnoptions));
- if (warnoptions == NULL || !PyList_Check(warnoptions))
+ PyObject *warnoptions;
+ if (_PySys_GetOptionalAttr(&_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
@@ -2847,8 +2928,10 @@ _PySys_AddWarnOptionWithError(PyThreadState *tstate,
PyObject *option)
return -1;
}
if (PyList_Append(warnoptions, option)) {
+ Py_DECREF(warnoptions);
return -1;
}
+ Py_DECREF(warnoptions);
return 0;
}
@@ -2889,16 +2972,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_GetOptionalAttr(&_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_GetOptionalAttr(&_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
@@ -2910,6 +3001,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;
@@ -2918,7 +3010,6 @@ get_xoptions(PyThreadState *tstate)
Py_DECREF(xoptions);
return NULL;
}
- Py_DECREF(xoptions);
}
return xoptions;
}
@@ -2957,11 +3048,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;
}
@@ -2984,7 +3077,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.
@@ -3720,16 +3815,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));
@@ -3961,12 +4055,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_GetOptionalAttr(&_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);
}
@@ -4054,8 +4151,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);
@@ -4065,6 +4162,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);
}
@@ -4096,15 +4194,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 e819909b6045c3..f8195c9ce9c090 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 @@ _Py_FindSourceFile(PyObject *filename, char* namebuf,
size_t namelen, PyObject *
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;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
