changeset:   92946:8165e44594c2
parent:      92944:cb94764bf8be
parent:      92945:4563fff4e099
user:        Benjamin Peterson <benjamin@python.org>
date:        Fri Oct 10 20:58:43 2014 -0400
files:       Modules/arraymodule.c
description:
merge 3.4 (closes #22605)


diff -r cb94764bf8be -r 8165e44594c2 Modules/arraymodule.c
--- a/Modules/arraymodule.c	Fri Oct 10 19:34:38 2014 -0400
+++ b/Modules/arraymodule.c	Fri Oct 10 20:58:43 2014 -0400
@@ -2709,7 +2709,7 @@
                     self->allocated = Py_SIZE(self);
                 }
             }
-            else if (initial != NULL && array_Check(initial)) {
+            else if (initial != NULL && array_Check(initial) && len > 0) {
                 arrayobject *self = (arrayobject *)a;
                 arrayobject *other = (arrayobject *)initial;
                 memcpy(self->ob_item, other->ob_item, len * other->ob_descr->itemsize);