From: Andrew M. Kuchling <amk@amk.ca>
Date: Tue, 3 Oct 2006 18:40:23 +0000 (+0000)
Subject: [Backport r50680 | neal.norwitz]
X-Git-Tag: v2.4.4c1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91697928ca2813d82a4cd0b6908590bae62d7fa4;p=thirdparty%2FPython%2Fcpython.git

[Backport r50680 | neal.norwitz]

Handle a NULL name properly.
---

diff --git a/Objects/fileobject.c b/Objects/fileobject.c
index 16499eec9f0b..4f5720cde195 100644
--- a/Objects/fileobject.c
+++ b/Objects/fileobject.c
@@ -328,11 +328,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);