diff options
| author | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:27:24 (GMT) |
|---|---|---|
| committer | Mark Dickinson <dickinsm@gmail.com> | 2010-01-29 17:27:24 (GMT) |
| commit | bc09964be115a81e6324dbea5b5fc049759e9430 (patch) | |
| tree | b58af14e0ed48291a828a07307a28b1c114d9931 /Objects | |
| parent | 8b441d0dcdb9380e999f0caead087c4365cb0bdd (diff) | |
| download | cpython-bc09964be115a81e6324dbea5b5fc049759e9430.zip cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.gz cpython-bc09964be115a81e6324dbea5b5fc049759e9430.tar.bz2 | |
Merged revisions 77821 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77821 | mark.dickinson | 2010-01-29 17:11:39 +0000 (Fri, 29 Jan 2010) | 3 lines
Issue #7788: Fix a crash produced by deleting a list slice with huge
step value. Patch by Marcin Bachry.
........
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/bytearrayobject.c | 3 | ||||
| -rw-r--r-- | Objects/listobject.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Objects/bytearrayobject.c b/Objects/bytearrayobject.c index 3603d4f..42f1ed6 100644 --- a/Objects/bytearrayobject.c +++ b/Objects/bytearrayobject.c @@ -642,7 +642,8 @@ bytearray_ass_subscript(PyByteArrayObject *self, PyObject *index, PyObject *valu else { if (needed == 0) { /* Delete slice */ - Py_ssize_t cur, i; + size_t cur; + Py_ssize_t i; if (!_canresize(self)) return -1; diff --git a/Objects/listobject.c b/Objects/listobject.c index f54b97d..a97d475 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -2444,7 +2444,8 @@ list_ass_subscript(PyListObject* self, PyObject* item, PyObject* value) if (value == NULL) { /* delete slice */ PyObject **garbage; - Py_ssize_t cur, i; + size_t cur; + Py_ssize_t i; if (slicelength <= 0) return 0; |