diff options
| author | Thomas Wouters <thomas@python.org> | 2007-01-23 15:09:19 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2007-01-23 15:09:19 (GMT) |
| commit | 1e42ab6e434044fdfcdc99b5b631ed972825a92c (patch) | |
| tree | aac6ac06981e283a12b2308d278a97dfb5edc110 /Python/pythonrun.c | |
| parent | 741e0bb5f46588ad71d3ac940a430e46e8d77df1 (diff) | |
| download | cpython-1e42ab6e434044fdfcdc99b5b631ed972825a92c.zip cpython-1e42ab6e434044fdfcdc99b5b631ed972825a92c.tar.gz cpython-1e42ab6e434044fdfcdc99b5b631ed972825a92c.tar.bz2 | |
Backport trunk revision 53527:
SF patch #1630975: Fix crash when replacing sys.stdout in sitecustomize
When running the interpreter in an environment that would cause it to set
stdout/stderr/stdin's encoding, having a sitecustomize that would replace
them with something other than PyFile objects would crash the interpreter.
Fix it by simply ignoring the encoding-setting for non-files.
This could do with a test, but I can think of no maintainable and portable
way to test this bug, short of adding a sitecustomize.py to the buildsystem
and have it always run with it (hmmm....)
Diffstat (limited to 'Python/pythonrun.c')
| -rw-r--r-- | Python/pythonrun.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index e8392ee..ddf714a 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -257,7 +257,8 @@ Py_InitializeEx(int install_sigs) sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); if (!sys_isatty) PyErr_Clear(); - if(sys_isatty && PyObject_IsTrue(sys_isatty)) { + if(sys_isatty && PyObject_IsTrue(sys_isatty) && + PyFile_Check(sys_stream)) { if (!PyFile_SetEncoding(sys_stream, codeset)) Py_FatalError("Cannot set codeset of stdin"); } @@ -267,7 +268,8 @@ Py_InitializeEx(int install_sigs) sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); if (!sys_isatty) PyErr_Clear(); - if(sys_isatty && PyObject_IsTrue(sys_isatty)) { + if(sys_isatty && PyObject_IsTrue(sys_isatty) && + PyFile_Check(sys_stream)) { if (!PyFile_SetEncoding(sys_stream, codeset)) Py_FatalError("Cannot set codeset of stdout"); } |