diff options
| author | Zackery Spytz <zspytz@gmail.com> | 2019-12-30 19:32:58 (GMT) |
|---|---|---|
| committer | Pablo Galindo <Pablogsal@gmail.com> | 2019-12-30 19:32:58 (GMT) |
| commit | d9e561d23d994e3ed15f4fcbd7ee5c8fe50f190b (patch) | |
| tree | 34162f9f568287e72843c154831efb35b2384a55 /Objects/listobject.c | |
| parent | 09c482fad11c769be38b2449f1056e264b701bb7 (diff) | |
| download | cpython-d9e561d23d994e3ed15f4fcbd7ee5c8fe50f190b.zip cpython-d9e561d23d994e3ed15f4fcbd7ee5c8fe50f190b.tar.gz cpython-d9e561d23d994e3ed15f4fcbd7ee5c8fe50f190b.tar.bz2 | |
bpo-38610: Fix possible crashes in several list methods (GH-17022)
Hold strong references to list elements while calling PyObject_RichCompareBool().
Diffstat (limited to 'Objects/listobject.c')
| -rw-r--r-- | Objects/listobject.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Objects/listobject.c b/Objects/listobject.c index 645742b..86690f7 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2553,7 +2553,10 @@ list_index_impl(PyListObject *self, PyObject *value, Py_ssize_t start, stop = 0; } for (i = start; i < stop && i < Py_SIZE(self); i++) { - int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ); + PyObject *obj = self->ob_item[i]; + Py_INCREF(obj); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); + Py_DECREF(obj); if (cmp > 0) return PyLong_FromSsize_t(i); else if (cmp < 0) @@ -2580,7 +2583,10 @@ list_count(PyListObject *self, PyObject *value) Py_ssize_t i; for (i = 0; i < Py_SIZE(self); i++) { - int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ); + PyObject *obj = self->ob_item[i]; + Py_INCREF(obj); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); + Py_DECREF(obj); if (cmp > 0) count++; else if (cmp < 0) @@ -2607,7 +2613,10 @@ list_remove(PyListObject *self, PyObject *value) Py_ssize_t i; for (i = 0; i < Py_SIZE(self); i++) { - int cmp = PyObject_RichCompareBool(self->ob_item[i], value, Py_EQ); + PyObject *obj = self->ob_item[i]; + Py_INCREF(obj); + int cmp = PyObject_RichCompareBool(obj, value, Py_EQ); + Py_DECREF(obj); if (cmp > 0) { if (list_ass_slice(self, i, i+1, (PyObject *)NULL) == 0) |