From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Thu, 29 Sep 2011 21:19:04 +0000 (+0200)
Subject: fileio_init() checks for failure on conversion to Py_UNICODE*
X-Git-Tag: v3.3.0a1~1434
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe9a861e740d2627618f1d8d7731d36946bf6994;p=thirdparty%2FPython%2Fcpython.git

fileio_init() checks for failure on conversion to Py_UNICODE*
---

diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 3de1ff5b2dd7..2bf8933b57be 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -259,9 +259,11 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
     }
 
 #ifdef MS_WINDOWS
-    if (PyUnicode_Check(nameobj))
-        widename = PyUnicode_AS_UNICODE(nameobj);
-    if (widename == NULL)
+    if (PyUnicode_Check(nameobj)) {
+        widename = PyUnicode_AsUnicode(nameobj);
+        if (widename == NULL)
+            return -1;
+    } else
 #endif
     if (fd < 0)
     {
@@ -378,7 +380,7 @@ fileio_init(PyObject *oself, PyObject *args, PyObject *kwds)
         if (self->fd < 0) {
 #ifdef MS_WINDOWS
             if (widename != NULL)
-                PyErr_SetFromErrnoWithUnicodeFilename(PyExc_IOError, widename);
+                PyErr_SetFromErrnoWithFilenameObject(PyExc_IOError, nameobj);
             else
 #endif
                 PyErr_SetFromErrnoWithFilename(PyExc_IOError, name);