prevent a rather unlikely segfault

This commit is contained in:
Benjamin Peterson 2009-11-02 15:06:45 +00:00
parent aec4124fed
commit e2caf1f60e
1 changed files with 8 additions and 2 deletions

View File

@ -183,9 +183,12 @@ PyList_GetItem(PyObject *op, Py_ssize_t i)
return NULL; return NULL;
} }
if (i < 0 || i >= Py_SIZE(op)) { if (i < 0 || i >= Py_SIZE(op)) {
if (indexerr == NULL) if (indexerr == NULL) {
indexerr = PyString_FromString( indexerr = PyString_FromString(
"list index out of range"); "list index out of range");
if (indexerr == NULL)
return NULL;
}
PyErr_SetObject(PyExc_IndexError, indexerr); PyErr_SetObject(PyExc_IndexError, indexerr);
return NULL; return NULL;
} }
@ -447,9 +450,12 @@ static PyObject *
list_item(PyListObject *a, Py_ssize_t i) list_item(PyListObject *a, Py_ssize_t i)
{ {
if (i < 0 || i >= Py_SIZE(a)) { if (i < 0 || i >= Py_SIZE(a)) {
if (indexerr == NULL) if (indexerr == NULL) {
indexerr = PyString_FromString( indexerr = PyString_FromString(
"list index out of range"); "list index out of range");
if (indexerr == NULL)
return NULL;
}
PyErr_SetObject(PyExc_IndexError, indexerr); PyErr_SetObject(PyExc_IndexError, indexerr);
return NULL; return NULL;
} }