[Python-checkins] cpython: Issue #16416: Fix error handling in _Py_wchar2char() _Py_char2wchar() functions
victor.stinner
python-checkins at python.org
Mon Nov 12 23:48:35 CET 2012
http://hg.python.org/cpython/rev/f3e512b5ffb3
changeset: 80415:f3e512b5ffb3
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Nov 12 23:32:21 2012 +0100
summary:
Issue #16416: Fix error handling in _Py_wchar2char() _Py_char2wchar() functions
files:
Objects/unicodeobject.c | 11 ++++++-----
Python/fileutils.c | 27 ++++++++++++++++-----------
2 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -4691,7 +4691,10 @@
#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 @@
/* Note: size will always be longer than the resulting Unicode
character count */
- if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1)) {
- PyErr_NoMemory();
- return NULL;
- }
+ if (PY_SSIZE_T_MAX / sizeof(wchar_t) < (size + 1))
+ return NULL;
unicode = PyMem_Malloc((size + 1) * sizeof(wchar_t));
if (!unicode)
return NULL;
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -67,10 +67,12 @@
#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 @@
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 @@
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 @@
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;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list