merge 3.4 (closes #22605)

benjaminp · benjaminp · commit 588dad0308b7 · 2014-10-10T20:58:43.000-04:00
diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
@@ -2709,7 +2709,7 @@ array_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
                     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);

Original file line number	Diff line number	Diff line change
`@@ -2709,7 +2709,7 @@ array_new(PyTypeObject type, PyObject args, PyObject *kwds)`
`2709`	`2709`	`self->allocated = Py_SIZE(self);`
`2710`	`2710`	`}`
`2711`	`2711`	`}`
`2712`		`- else if (initial != NULL && array_Check(initial)) {`
	`2712`	`+ else if (initial != NULL && array_Check(initial) && len > 0) {`
`2713`	`2713`	`arrayobject self = (arrayobject )a;`
`2714`	`2714`	`arrayobject other = (arrayobject )initial;`
`2715`	`2715`	`memcpy(self->ob_item, other->ob_item, len * other->ob_descr->itemsize);`