mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 03:01:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Merged revisions 73862,73872 via svnmerge from

Browse source 
svn+ssh://svn.python.org/python/branches/py3k

........
  r73862 | alexandre.vassalotti | 2009-07-05 21:57:00 +0200 (So, 05 Jul 2009) | 2 lines

  Add the fix for issue 4509 to the mapping methods.
........
  r73872 | gregory.p.smith | 2009-07-07 07:06:04 +0200 (Di, 07 Jul 2009) | 2 lines

  Add a unittest for r73566.
........
This commit is contained in:
Georg Brandl 2009-08-13 09:05:38 +00:00
parent ae83d6ee37
commit df475156f4
3 changed files with 40 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/arraymodule.c
View file

@ -1699,6 +1699,16 @@ array_ass_subscr(arrayobject* self, PyObject* item, PyObject* value)
if ((step > 0 && stop < start) ||
(step < 0 && stop > start))
stop = start;
/* Issue #4509: If the array has exported buffers and the slice
assignment would change the size of the array, fail early to make
sure we don't modify it. */
if ((needed == 0 || slicelength != needed) && self->ob_exports > 0) {
PyErr_SetString(PyExc_BufferError,
"cannot resize an array that is exporting buffers");
return -1;
}
if (step == 1) {
if (slicelength > needed) {
memmove(self->ob_item + (start + needed) * itemsize,