From fc28e0de584e8040bd27080b0111a722243b82c7 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 16 Jul 2006 02:32:03 +0000 Subject: Handle a NULL name properly. Reported by Klocwork #67 --- Objects/fileobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Objects/fileobject.c b/Objects/fileobject.c index 76b7da6..5297538 100644 --- 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); -- cgit v0.12