mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Issue #18203: Fix _Py_DecodeUTF8_surrogateescape(), use PyMem_RawMalloc() as _Py_char2wchar()

Browse source
This commit is contained in:
Victor Stinner 2013-07-07 22:57:45 +02:00
parent fa535f5220
commit 6f8eeee7b9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Objects/unicodeobject.c
View file

@ -4806,7 +4806,7 @@ onError:
used to decode the command line arguments on Mac OS X. used to decode the command line arguments on Mac OS X.
Return a pointer to a newly allocated wide character string (use 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* wchar_t*
_Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) _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 */ character count */
if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1))
return NULL; return NULL;
unicode = PyMem_Malloc((size + 1) * sizeof(wchar_t)); unicode = PyMem_RawMalloc((size + 1) * sizeof(wchar_t));
if (!unicode) if (!unicode)
return NULL; return NULL;