traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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....)
This commit is contained in:
Thomas Wouters 2007-01-23 13:42:00 +00:00
parent d2e22903d3
commit afea529088
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Objects/fileobject.c
View File

@ -354,6 +354,8 @@ PyFile_SetEncoding(PyObject *f, const char *enc)
{ {
PyFileObject *file = (PyFileObject*)f; PyFileObject *file = (PyFileObject*)f;
PyObject *str = PyString_FromString(enc); PyObject *str = PyString_FromString(enc);
assert(PyFile_Check(f));
if (!str) if (!str)
return 0; return 0;
Py_DECREF(file->f_encoding); Py_DECREF(file->f_encoding);

9
Python/pythonrun.c
View File

@ -275,7 +275,8 @@ Py_InitializeEx(int install_sigs)
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
if (!sys_isatty) if (!sys_isatty)
PyErr_Clear(); 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)) if (!PyFile_SetEncoding(sys_stream, codeset))
Py_FatalError("Cannot set codeset of stdin"); Py_FatalError("Cannot set codeset of stdin");
} }
@ -285,7 +286,8 @@ Py_InitializeEx(int install_sigs)
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
if (!sys_isatty) if (!sys_isatty)
PyErr_Clear(); 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)) if (!PyFile_SetEncoding(sys_stream, codeset))
Py_FatalError("Cannot set codeset of stdout"); Py_FatalError("Cannot set codeset of stdout");
} }
@ -295,7 +297,8 @@ Py_InitializeEx(int install_sigs)
sys_isatty = PyObject_CallMethod(sys_stream, "isatty", ""); sys_isatty = PyObject_CallMethod(sys_stream, "isatty", "");
if (!sys_isatty) if (!sys_isatty)
PyErr_Clear(); 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)) if (!PyFile_SetEncoding(sys_stream, codeset))
Py_FatalError("Cannot set codeset of stderr"); Py_FatalError("Cannot set codeset of stderr");
} }

6
Python/sysmodule.c
View File

@ -1087,17 +1087,17 @@ _PySys_Init(void)
if (PyErr_Occurred()) if (PyErr_Occurred())
return NULL; return NULL;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
if(isatty(_fileno(stdin))){ if(isatty(_fileno(stdin)) && PyFile_Check(sysin)) {
sprintf(buf, "cp%d", GetConsoleCP()); sprintf(buf, "cp%d", GetConsoleCP());
if (!PyFile_SetEncoding(sysin, buf)) if (!PyFile_SetEncoding(sysin, buf))
return NULL; return NULL;
} }
if(isatty(_fileno(stdout))) { if(isatty(_fileno(stdout)) && PyFile_Check(sysout)) {
sprintf(buf, "cp%d", GetConsoleOutputCP()); sprintf(buf, "cp%d", GetConsoleOutputCP());
if (!PyFile_SetEncoding(sysout, buf)) if (!PyFile_SetEncoding(sysout, buf))
return NULL; return NULL;
} }
if(isatty(_fileno(stderr))) { if(isatty(_fileno(stderr)) && PyFile_Check(syserr)) {
sprintf(buf, "cp%d", GetConsoleOutputCP()); sprintf(buf, "cp%d", GetConsoleOutputCP());
if (!PyFile_SetEncoding(syserr, buf)) if (!PyFile_SetEncoding(syserr, buf))
return NULL; return NULL;