From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Sat, 16 Oct 2010 22:47:37 +0000 (+0000)
Subject: _Py_wreadlink() uses _Py_char2wchar() to decode the result, to support
X-Git-Tag: v3.2a4~522
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f711f4a3e6e2eb9ea9d9d0f841766e9df74ea29;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 076f510debd0..cfafd865c54d 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -307,6 +307,7 @@ _Py_wreadlink(const wchar_t *path, wchar_t *buf, size_t bufsiz)
 {
     char *cpath;
     char cbuf[PATH_MAX];
+    wchar_t *wbuf;
     int res;
     size_t r1;
 
@@ -324,11 +325,15 @@ _Py_wreadlink(const wchar_t *path, wchar_t *buf, size_t bufsiz)
         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