commit beac78bb242ba56088570d9df3a852f581adc0d5
author Victor Stinner <victor.stinner@haypocalc.com> Tue Oct 11 21:55:01 2011 +0200
committer Victor Stinner <victor.stinner@haypocalc.com> Tue Oct 11 21:55:01 2011 +0200
tree 23482d5390130c302c2783344903218a1ab229aa
parent e459a0877e0ca76e3af1057722a0e366395c661f

Use PyUnicode_AsUnicodeAndSize() instead of PyUnicode_GET_SIZE()

Python/import.c

diff --git a/Python/import.c b/Python/import.c
index 3d6c6ed..6f564a6 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -2282,6 +2282,8 @@
     WIN32_FIND_DATAW data;
     HANDLE h;
     int cmp;
+    wchar_t *wname;
+    Py_ssizet wname_len;
 
     if (Py_GETENV("PYTHONCASEOK") != NULL)
         return 1;
@@ -2294,9 +2296,12 @@
         return 0;
     }
     FindClose(h);
-    cmp = wcsncmp(data.cFileName,
-                  PyUnicode_AS_UNICODE(name),
-                  PyUnicode_GET_SIZE(name));
+
+    wname = PyUnicode_AsUnicodeAndSize(name, &wname_len);
+    if (wname == NULL)
+        return -1;
+
+    cmp = wcsncmp(data.cFileName, wname, wname_len);
     return cmp == 0;
 #elif defined(USE_CASE_OK_BYTES)
     int match;