languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-15 22:00:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 3.2

Browse source
This commit is contained in:
Benjamin Peterson 2014-04-14 11:46:51 -04:00
parent 156285c35f 6ef2b36afa
commit 9beee049b0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Modules/_json.c
View file

@ -975,10 +975,11 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
kind = PyUnicode_KIND(pystr);
length = PyUnicode_GET_LENGTH(pystr);
if (idx < 0)
/* Compatibility with Python version. */
idx += length;
if (idx < 0 || idx >= length) {
if (idx < 0) {
PyErr_SetString(PyExc_ValueError, "idx cannot be negative");
return NULL;
}
if (idx >= length) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}