diff options
| author |   Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-08 20:50:09 +0000 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-06-08 20:50:09 +0000 |
| commit | a01c6b3c9e6f9e0d3411051a3ff646852b37b4d6 (patch) | |
| tree | c13e07621ccdd87b0ce68dcbdf3a05a5bfe55215 /Python | |
| parent | Merged revisions 81838 via svnmerge from (diff) | |
| download | cpython-a01c6b3c9e6f9e0d3411051a3ff646852b37b4d6.tar.gz cpython-a01c6b3c9e6f9e0d3411051a3ff646852b37b4d6.tar.bz2 cpython-a01c6b3c9e6f9e0d3411051a3ff646852b37b4d6.zip | |
Merged revisions 81841 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r81841 | victor.stinner | 2010-06-08 22:46:00 +0200 (mar., 08 juin 2010) | 6 lines
sys_pyfile_write() does nothing if file is NULL
mywrite() falls back to the C file object if sys_pyfile_write() returns an
error. This patch fixes a segfault is Py_FatalError() is called in an early
stage of Python initialization.
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/sysmodule.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index ea67710423f..e33047308d1 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1670,6 +1670,9 @@ sys_pyfile_write(const char *text, PyObject *file) PyObject *unicode = NULL, *writer = NULL, *args = NULL, *result = NULL; int err; + if (file == NULL) + return -1; + unicode = PyUnicode_FromString(text); if (unicode == NULL) goto error; |