commit 3f711f4a3e6e2eb9ea9d9d0f841766e9df74ea29
author Victor Stinner <victor.stinner@haypocalc.com> Sat Oct 16 22:47:37 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Sat Oct 16 22:47:37 2010 +0000
tree 320e5f1bab23f23b29b403754fc70d4a49421e17
parent 9d396399dad743124535dcb28cd073617ad15980

_Py_wreadlink() uses _Py_char2wchar() to decode the result, to support
surrogate characters.

Python/fileutils.c

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 076f510..cfafd86 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -307,6 +307,7 @@
 {
     char *cpath;
     char cbuf[PATH_MAX];
+    wchar_t *wbuf;
     int res;
     size_t r1;
 
@@ -324,11 +325,15 @@
         return -1;
     }
     cbuf[res] = '\0'; /* buf will be null terminated */
-    r1 = mbstowcs(buf, cbuf, bufsiz);
-    if (r1 == -1) {
+    wbuf = _Py_char2wchar(cbuf);
+    r1 = wcslen(wbuf);
+    if (bufsiz <= r1) {
+        PyMem_Free(wbuf);
         errno = EINVAL;
         return -1;
     }
+    wcsncpy(buf, wbuf, bufsiz);
+    PyMem_Free(wbuf);
     return (int)r1;
 }
 #endif