Merged revisions 77823 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r77823 | mark.dickinson | 2010-01-29 17:27:24 +0000 (Fri, 29 Jan 2010) | 10 lines

  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.
  ........
................
This commit is contained in:
Mark Dickinson 2010-01-29 17:29:21 +00:00
parent d692c4a754
commit a53f2c997e
7 changed files with 17 additions and 5 deletions

View file

@ -650,7 +650,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;

View file

@ -2430,7 +2430,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;