From: Victor Stinner Date: Sun, 7 Jul 2013 20:57:45 +0000 (+0200) Subject: Issue #18203: Fix _Py_DecodeUTF8_surrogateescape(), use PyMem_RawMalloc() as _Py_char... X-Git-Tag: v3.4.0a1~293 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f8eeee7b9cae7e3f899c89baefe9acc575f2fb5;p=thirdparty%2FPython%2Fcpython.git Issue #18203: Fix _Py_DecodeUTF8_surrogateescape(), use PyMem_RawMalloc() as _Py_char2wchar() --- diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 3a4cc207188b..ac5f66aeaaa7 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4806,7 +4806,7 @@ onError: used to decode the command line arguments on Mac OS X. Return a pointer to a newly allocated wide character string (use - PyMem_Free() to free the memory), or NULL on memory allocation error. */ + PyMem_RawFree() to free the memory), or NULL on memory allocation error. */ wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) @@ -4819,7 +4819,7 @@ _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) character count */ if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) return NULL; - unicode = PyMem_Malloc((size + 1) * sizeof(wchar_t)); + unicode = PyMem_RawMalloc((size + 1) * sizeof(wchar_t)); if (!unicode) return NULL;