1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PyUnicode_AsUnicodeCopy() now checks if PyUnicode_AsUnicode() failed

Browse Source
This commit is contained in:
Victor Stinner 2011-10-11 22:12:48 +02:00
parent d9c0631d77
commit 577db2c9f0
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Objects/unicodeobject.c
View File

@ -13775,13 +13775,16 @@ Py_UNICODE*
PyUnicode_AsUnicodeCopy(PyObject *object) PyUnicode_AsUnicodeCopy(PyObject *object)
{ {
PyUnicodeObject *unicode = (PyUnicodeObject *)object; PyUnicodeObject *unicode = (PyUnicodeObject *)object;
Py_UNICODE *copy; Py_UNICODE *u, *copy;
Py_ssize_t size; Py_ssize_t size;
if (!PyUnicode_Check(unicode)) { if (!PyUnicode_Check(unicode)) {
PyErr_BadArgument(); PyErr_BadArgument();
return NULL; return NULL;
} }
u = PyUnicode_AsUnicode(object);
if (u == NULL)
return NULL;
/* Ensure we won't overflow the size. */ /* Ensure we won't overflow the size. */
if (PyUnicode_GET_SIZE(unicode) > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) { if (PyUnicode_GET_SIZE(unicode) > ((PY_SSIZE_T_MAX / sizeof(Py_UNICODE)) - 1)) {
PyErr_NoMemory(); PyErr_NoMemory();
@ -13794,7 +13797,7 @@ PyUnicode_AsUnicodeCopy(PyObject *object)
PyErr_NoMemory(); PyErr_NoMemory();
return NULL; return NULL;
} }
memcpy(copy, PyUnicode_AS_UNICODE(unicode), size); memcpy(copy, u, size);
return copy; return copy;
} }