diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2012-11-12 22:32:21 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2012-11-12 22:32:21 (GMT) |
| commit | 0d92c4f667518c7a24abda885e10c0c8e72cae57 (patch) | |
| tree | a09b16eefaea36ba494d205dde4050f346d2a1fc /Objects/unicodeobject.c | |
| parent | fc93ec5966f67b94cd46c3b8ab6400a54f3443ac (diff) | |
| download | cpython-0d92c4f667518c7a24abda885e10c0c8e72cae57.zip cpython-0d92c4f667518c7a24abda885e10c0c8e72cae57.tar.gz cpython-0d92c4f667518c7a24abda885e10c0c8e72cae57.tar.bz2 | |
Issue #16416: Fix error handling in _Py_wchar2char() _Py_char2wchar() functions
Diffstat (limited to 'Objects/unicodeobject.c')
| -rw-r--r-- | Objects/unicodeobject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c index 6a30e8d..7856e77 100644 --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -4691,7 +4691,10 @@ onError: #ifdef __APPLE__ /* Simplified UTF-8 decoder using surrogateescape error handler, - 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 + PyMem_Free() to free the memory), or NULL on memory allocation error. */ wchar_t* _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) @@ -4702,10 +4705,8 @@ _Py_DecodeUTF8_surrogateescape(const char *s, Py_ssize_t size) /* Note: size will always be longer than the resulting Unicode character count */ - if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) { - PyErr_NoMemory(); + if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) return NULL; - } unicode = PyMem_Malloc((size + 1) * sizeof(wchar_t)); if (!unicode) return NULL; |