From 1e42ab6e434044fdfcdc99b5b631ed972825a92c Mon Sep 17 00:00:00 2001 From: Thomas Wouters Date: Tue, 23 Jan 2007 15:09:19 +0000 Subject: 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....) --- Misc/NEWS | 2 ++ Objects/fileobject.c | 2 ++ Python/pythonrun.c | 6 ++++-- Python/sysmodule.c | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index ff711ad..8aa13ba 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -13,6 +13,8 @@ What's New in Python 2.4.5c1? Core and builtins ----------------- +- patch #1630975: Fix crash when replacing sys.stdout in sitecustomize.py + - Bug #1590891: random.randrange don't return correct value for big number - Bug #1542016: make sys.callstats() match its docstring and return an diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 0fcad12..ee7bc48 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -282,6 +282,8 @@ PyFile_SetEncoding(PyObject *f, const char *enc) { PyFileObject *file = (PyFileObject*)f; PyObject *str = PyString_FromString(enc); + + assert(PyFile_Check(f)); if (!str) return 0; Py_DECREF(file->f_encoding); 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"); } diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 0883178..d2229a6 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -972,12 +972,12 @@ _PySys_Init(void) if (PyErr_Occurred()) return NULL; #ifdef MS_WINDOWS - if(isatty(_fileno(stdin))){ + if(isatty(_fileno(stdin)) && PyFile_Check(sysin)) { sprintf(buf, "cp%d", GetConsoleCP()); if (!PyFile_SetEncoding(sysin, buf)) return NULL; } - if(isatty(_fileno(stdout))) { + if(isatty(_fileno(stdout)) && PyFile_Check(sysout)) { sprintf(buf, "cp%d", GetConsoleOutputCP()); if (!PyFile_SetEncoding(sysout, buf)) return NULL; -- cgit v0.12