diff options
Diffstat (limited to 'Modules')
-rw-r--r-- | Modules/_localemodule.c | 15 | ||||
-rw-r--r-- | Modules/arraymodule.c | 17 | ||||
-rw-r--r-- | Modules/readline.c | 3 | ||||
-rw-r--r-- | Modules/selectmodule.c | 5 |
4 files changed, 21 insertions, 19 deletions
diff --git a/Modules/_localemodule.c b/Modules/_localemodule.c index 7e2f1a997b..c55bd0d846 100644 --- a/Modules/_localemodule.c +++ b/Modules/_localemodule.c @@ -73,20 +73,13 @@ copy_grouping(char* s) do { i++; val = PyInt_FromLong(s[i]); - if (!val) - break; - if (PyList_SetItem(result, i, val)) { - Py_DECREF(val); - val = NULL; - break; + if (val == NULL) { + Py_DECREF(result); + return NULL; } + PyList_SET_ITEM(result, i, val); } while (s[i] != '\0' && s[i] != CHAR_MAX); - if (!val) { - Py_DECREF(result); - return NULL; - } - return result; } diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c index 5bd3a42f00..8d4eb0932d 100644 --- a/Modules/arraymodule.c +++ b/Modules/arraymodule.c @@ -1344,7 +1344,7 @@ array_fromlist(arrayobject *self, PyObject *list) Py_SIZE(self) += n; self->allocated = Py_SIZE(self); for (i = 0; i < n; i++) { - PyObject *v = PyList_GetItem(list, i); + PyObject *v = PyList_GET_ITEM(list, i); if ((*self->ob_descr->setitem)(self, Py_SIZE(self) - n + i, v) != 0) { Py_SIZE(self) -= n; @@ -1357,6 +1357,19 @@ array_fromlist(arrayobject *self, PyObject *list) self->allocated = Py_SIZE(self); return NULL; } + if (n != PyList_GET_SIZE(list)) { + PyErr_SetString(PyExc_RuntimeError, + "list changed size during iteration"); + Py_SIZE(self) -= n; + if (itemsize && (Py_SIZE(self) > PY_SSIZE_T_MAX / itemsize)) { + return PyErr_NoMemory(); + } + PyMem_RESIZE(item, char, + Py_SIZE(self) * itemsize); + self->ob_item = item; + self->allocated = Py_SIZE(self); + return NULL; + } } } Py_INCREF(Py_None); @@ -1383,7 +1396,7 @@ array_tolist(arrayobject *self, PyObject *unused) Py_DECREF(list); return NULL; } - PyList_SetItem(list, i, v); + PyList_SET_ITEM(list, i, v); } return list; } diff --git a/Modules/readline.c b/Modules/readline.c index 1e10dd708b..0262135823 100644 --- a/Modules/readline.c +++ b/Modules/readline.c @@ -792,8 +792,7 @@ on_completion_display_matches_hook(char **matches, s = PyString_FromString(matches[i+1]); if (s == NULL) goto error; - if (PyList_SetItem(m, i, s) == -1) - goto error; + PyList_SET_ITEM(m, i, s); } r = PyObject_CallFunction(completion_display_matches_hook, diff --git a/Modules/selectmodule.c b/Modules/selectmodule.c index 1dec6a120d..dc22f105fd 100644 --- a/Modules/selectmodule.c +++ b/Modules/selectmodule.c @@ -601,10 +601,7 @@ poll_poll(pollObject *self, PyObject *args) goto error; } PyTuple_SET_ITEM(value, 1, num); - if ((PyList_SetItem(result_list, j, value)) == -1) { - Py_DECREF(value); - goto error; - } + PyList_SET_ITEM(result_list, j, value); i++; } } |