[Python-checkins] r52107 - python/branches/release24-maint/Objects/fileobject.c
andrew.kuchling
python-checkins at python.org
Tue Oct 3 20:40:24 CEST 2006
Author: andrew.kuchling
Date: Tue Oct 3 20:40:23 2006
New Revision: 52107
Modified:
python/branches/release24-maint/Objects/fileobject.c
Log:
[Backport r50680 | neal.norwitz]
Handle a NULL name properly.
Modified: python/branches/release24-maint/Objects/fileobject.c
==============================================================================
--- python/branches/release24-maint/Objects/fileobject.c (original)
+++ python/branches/release24-maint/Objects/fileobject.c Tue Oct 3 20:40:23 2006
@@ -328,11 +328,11 @@
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);
More information about the Python-checkins
mailing list