diff options
| author | Thomas Wouters <thomas@python.org> | 2007-01-23 13:42:00 (GMT) |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2007-01-23 13:42:00 (GMT) |
| commit | afea529088d6447b1fc46318bdeec7c5de875202 (patch) | |
| tree | 45ea7de7b5a460a0badf6e67fdd2ee766cba3b7f /Objects | |
| parent | d2e22903d353e8037b0e448a976052886f75f4df (diff) | |
| download | cpython-afea529088d6447b1fc46318bdeec7c5de875202.zip cpython-afea529088d6447b1fc46318bdeec7c5de875202.tar.gz cpython-afea529088d6447b1fc46318bdeec7c5de875202.tar.bz2 | |
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 'Objects')
| -rw-r--r-- | Objects/fileobject.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 90c9687..1880187 100644 --- a/Objects/fileobject.c +++ b/Objects/fileobject.c @@ -354,6 +354,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); |