mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-14 04:37:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge 3.4

Browse source
This commit is contained in:
Benjamin Peterson 2014-04-14 11:48:29 -04:00
commit f33201b6db
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/_json.c
View file

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