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

Issue #28822: Adjust indices handling of PyUnicode_FindChar().

Browse source
This commit is contained in:
Xiang Zhang 2016-12-20 22:52:33 +08:00
parent 38f225dd48
commit b211068f5c
5 changed files with 55 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Objects/unicodeobject.c
View file

@ -9461,16 +9461,12 @@ PyUnicode_FindChar(PyObject *str, Py_UCS4 ch,
int direction)
{
int kind;
Py_ssize_t result;
Py_ssize_t len, result;
if (PyUnicode_READY(str) == -1)
return -2;
if (start < 0 || end < 0) {
PyErr_SetString(PyExc_IndexError, "string index out of range");
return -2;
}
if (end > PyUnicode_GET_LENGTH(str))
end = PyUnicode_GET_LENGTH(str);
if (start >= end)
len = PyUnicode_GET_LENGTH(str);
ADJUST_INDICES(start, end, len);
if (end - start < 1)
return -1;
kind = PyUnicode_KIND(str);
result = findchar(PyUnicode_1BYTE_DATA(str) + kind*start,