traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #16416: Fix error handling in _Py_wchar2char() _Py_char2wchar() functions

This commit is contained in:
Victor Stinner 2012-11-12 23:32:21 +01:00
parent fc93ec5966
commit 0d92c4f667
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Objects/unicodeobject.c
View File

@ -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;

27
Python/fileutils.c
View File

@ -67,10 +67,12 @@ _Py_char2wchar(const char* arg, size_t *size)
#ifdef __APPLE__
wchar_t *wstr;
wstr = _Py_DecodeUTF8_surrogateescape(arg, strlen(arg));
if (wstr == NULL)
return NULL;
if (size != NULL)
*size = wcslen(wstr);
if (size != NULL) {
if (wstr != NULL)
*size = wcslen(wstr);
else
*size = (size_t)-1;
}
return wstr;
#else
wchar_t *res;
@ -204,22 +206,25 @@ _Py_wchar2char(const wchar_t *text, size_t *error_pos)
char *cpath;
unicode = PyUnicode_FromWideChar(text, wcslen(text));
if (unicode == NULL) {
Py_DECREF(unicode);
if (unicode == NULL)
return NULL;
}
bytes = _PyUnicode_AsUTF8String(unicode, "surrogateescape");
Py_DECREF(unicode);
if (bytes == NULL) {
PyErr_Clear();
if (error_pos != NULL)
*error_pos = (size_t)-1;
return NULL;
}
len = PyBytes_GET_SIZE(bytes);
cpath = PyMem_Malloc(len+1);
if (cpath == NULL) {
PyErr_Clear();
Py_DECREF(bytes);
if (error_pos != NULL)
*error_pos = (size_t)-1;
return NULL;
}
memcpy(cpath, PyBytes_AsString(bytes), len + 1);
@ -231,9 +236,6 @@ _Py_wchar2char(const wchar_t *text, size_t *error_pos)
size_t i, size, converted;
wchar_t c, buf[2];
if (error_pos != NULL)
*error_pos = (size_t)-1;
/* The function works in two steps:
1. compute the length of the output buffer in bytes (size)
2. outputs the bytes */
@ -280,8 +282,11 @@ _Py_wchar2char(const wchar_t *text, size_t *error_pos)
size += 1; /* nul byte at the end */
result = PyMem_Malloc(size);
if (result == NULL)
if (result == NULL) {
if (error_pos != NULL)
*error_pos = (size_t)-1;
return NULL;
}
bytes = result;
}
return result;