in scan_once, prevent the reading of arbitrary memory when passed a negative index

Bug reported by Guido Vranken.
This commit is contained in:
Benjamin Peterson 2014-04-13 22:10:38 -04:00
parent 80e6af1f61
commit 99b5afab74
4 changed files with 12 additions and 1 deletions

View file

@ -930,7 +930,10 @@ scan_once_unicode(PyScannerObject *s, PyObject *pystr, Py_ssize_t idx, Py_ssize_
PyObject *res;
Py_UNICODE *str = PyUnicode_AS_UNICODE(pystr);
Py_ssize_t length = PyUnicode_GET_SIZE(pystr);
if (idx >= length) {
if (idx < 0)
/* Compatibility with Python version. */
idx += length;
if (idx < 0 || idx >= length) {
PyErr_SetNone(PyExc_StopIteration);
return NULL;
}