mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 19:34:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

PyUnicode_Substring() now accepts end bigger than string length

Browse source 
Fix also a bug: call PyUnicode_READY() before reading string length.
This commit is contained in:
Victor Stinner 2011-10-01 03:55:54 +02:00
parent 9f789e7f63
commit de636f3c34
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/unicodeobject.c
View file

@ -10447,6 +10447,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end)
int kind; int kind;
Py_ssize_t length; Py_ssize_t length;
if (PyUnicode_READY(self) == -1)
return NULL;
end = Py_MIN(end, PyUnicode_GET_LENGTH(self));
if (start == 0 && end == PyUnicode_GET_LENGTH(self)) if (start == 0 && end == PyUnicode_GET_LENGTH(self))
{ {
if (PyUnicode_CheckExact(self)) { if (PyUnicode_CheckExact(self)) {
@ -10461,13 +10466,11 @@ PyUnicode_Substring(PyObject *self, Py_ssize_t start, Py_ssize_t end)
if (length == 1) if (length == 1)
return unicode_getitem((PyUnicodeObject*)self, start); return unicode_getitem((PyUnicodeObject*)self, start);
if (start < 0 || end < 0 || end > PyUnicode_GET_LENGTH(self)) { if (start < 0 || end < 0) {
PyErr_SetString(PyExc_IndexError, "string index out of range"); PyErr_SetString(PyExc_IndexError, "string index out of range");
return NULL; return NULL;
} }
if (PyUnicode_READY(self) == -1)
return NULL;
kind = PyUnicode_KIND(self); kind = PyUnicode_KIND(self);
data = PyUnicode_1BYTE_DATA(self); data = PyUnicode_1BYTE_DATA(self);
return PyUnicode_FromKindAndData(kind, return PyUnicode_FromKindAndData(kind,