Handle a NULL name properly.

Reported by Klocwork #67

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 76b7da641950399bb85c330842a0832c970258de..5297538082ec5319683745fa91111d0d26e56de7 100644 (file)
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -411,11 +411,11 @@ file_repr(PyFileObject *f)
        if (PyUnicode_Check(f->f_name)) {
 #ifdef Py_USING_UNICODE
                PyObject *ret = NULL;
-               PyObject *name;
-               name = PyUnicode_AsUnicodeEscapeString(f->f_name);
+               PyObject *name = PyUnicode_AsUnicodeEscapeString(f->f_name);
+               const char *name_str = name ? PyString_AsString(name) : "?";
                ret = PyString_FromFormat("<%s file u'%s', mode '%s' at %p>",
                                   f->f_fp == NULL ? "closed" : "open",
-                                  PyString_AsString(name),
+                                  name_str,
                                   PyString_AsString(f->f_mode),
                                   f);
                Py_XDECREF(name);