mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-09 08:31:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix for

Browse source 
[ 587875 ] crash on deleting extended slice

The array code got simpler, always a good thing!
This commit is contained in:
Michael W. Hudson 2002-07-29 14:35:04 +00:00
parent 085358a3e2
commit 56796f672f
4 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/arraymodule.c
View file

@ -1564,7 +1564,7 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
if (value == NULL) {
/* delete slice */
int cur, i;
int cur, i, extra;
if (slicelength <= 0)
return 0;
@ -1575,16 +1575,17 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
step = -step;
}
for (cur = start, i = 0; cur < stop;
for (cur = start, i = 0; i < slicelength - 1;
cur += step, i++) {
memmove(self->ob_item + (cur - i)*itemsize,
self->ob_item + (cur + 1)*itemsize,
(step - 1) * itemsize);
}
if (self->ob_size > (start + slicelength*step)) {
memmove(self->ob_item + (start + slicelength*(step - 1))*itemsize,
self->ob_item + (start + slicelength*step)*itemsize,
(self->ob_size - (start + slicelength*step))*itemsize);
extra = self->ob_size - (cur + 1);
if (extra > 0) {
memmove(self->ob_item + (cur - i)*itemsize,
self->ob_item + (cur + 1)*itemsize,
extra*itemsize);
}
self->ob_size -= slicelength;