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

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

diff --git a/Python/fileutils.c b/Python/fileutils.c
index 147636f2c789..b8910b7be640 100644
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -353,6 +353,7 @@ _Py_wrealpath(const wchar_t *path,
 {
     char *cpath;
     char cresolved_path[PATH_MAX];
+    wchar_t *wresolved_path;
     char *res;
     size_t r;
     cpath = _Py_wchar2char(path);
@@ -364,11 +365,20 @@ _Py_wrealpath(const wchar_t *path,
     PyMem_Free(cpath);
     if (res == NULL)
         return NULL;
-    r = mbstowcs(resolved_path, cresolved_path, resolved_path_size);
-    if (r == (size_t)-1 || r >= PATH_MAX) {
+
+    wresolved_path = _Py_char2wchar(cresolved_path);
+    if (wresolved_path == NULL) {
+        errno = EINVAL;
+        return NULL;
+    }
+    r = wcslen(wresolved_path);
+    if (resolved_path_size <= r) {
+        PyMem_Free(wresolved_path);
         errno = EINVAL;
         return NULL;
     }
+    wcsncpy(resolved_path, wresolved_path, resolved_path_size);
+    PyMem_Free(wresolved_path);
     return resolved_path;
 }
 #endif