From: Neal Norwitz <nnorwitz@gmail.com>
Date: Sun, 16 Jul 2006 02:32:03 +0000 (+0000)
Subject: Handle a NULL name properly.
X-Git-Tag: v2.5b3~236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc28e0de584e8040bd27080b0111a722243b82c7;p=python

Handle a NULL name properly.

Reported by Klocwork #67
---

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 76b7da6419..5297538082 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);