diff Modules/arraymodule.c @ 55603:12fec73cb8e5 3.1

Merged revisions 73862,73872 via svnmerge from 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. ........
author Georg Brandl <georg@python.org>
date Thu, 13 Aug 2009 09:05:38 +0000
parents 680ad8eed33b
children 6de64896c6f8
line wrap: on
line diff
--- a/Modules/arraymodule.c	Thu Aug 13 09:04:31 2009 +0000
+++ b/Modules/arraymodule.c	Thu Aug 13 09:05:38 2009 +0000
@@ -1699,6 +1699,16 @@
 	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,