(original) (raw)

changeset: 84501:31a635303e55 user: Victor Stinner victor.stinner@gmail.com date: Sun Jul 07 22:57:45 2013 +0200 files: Objects/unicodeobject.c description: Issue #18203: Fix _Py_DecodeUTF8_surrogateescape(), use PyMem_RawMalloc() as _Py_char2wchar() diff -r 7f17c67b5bf6 -r 31a635303e55 Objects/unicodeobject.c --- a/Objects/unicodeobject.c Sun Jul 07 17:35:11 2013 +0200 +++ b/Objects/unicodeobject.c Sun Jul 07 22:57:45 2013 +0200 @@ -4806,7 +4806,7 @@ 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 @@ 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; /victor.stinner@gmail.com