mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 05:58:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

PyUnicode_FromKindAndData() fails with a ValueError if size < 0

Browse source
This commit is contained in:
Victor Stinner 2011-11-22 01:29:14 +01:00
parent 42885206ec
commit cfed46e00a
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Objects/unicodeobject.c
View file

@ -1906,6 +1906,10 @@ _PyUnicode_FromUCS4(const Py_UCS4 *u, Py_ssize_t size)
PyObject* PyObject*
PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size) PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)
{ {
if (size < 0) {
PyErr_SetString(PyExc_ValueError, "size must be positive");
return NULL;
}
switch(kind) { switch(kind) {
case PyUnicode_1BYTE_KIND: case PyUnicode_1BYTE_KIND:
return _PyUnicode_FromUCS1(buffer, size); return _PyUnicode_FromUCS1(buffer, size);
@ -1914,7 +1918,6 @@ PyUnicode_FromKindAndData(int kind, const void *buffer, Py_ssize_t size)
case PyUnicode_4BYTE_KIND: case PyUnicode_4BYTE_KIND:
return _PyUnicode_FromUCS4(buffer, size); return _PyUnicode_FromUCS4(buffer, size);
default: default:
assert(0 && "invalid kind");
PyErr_SetString(PyExc_SystemError, "invalid kind"); PyErr_SetString(PyExc_SystemError, "invalid kind");
return NULL; return NULL;
} }