py/objarray: Fix array slice assignment when array is reallocated.

dpgeorge · dpgeorge · commit 77f85db41e56 · 2016-03-14T23:12:54.000Z
Addresses issue adafruit#1898.
diff --git a/py/objarray.c b/py/objarray.c
@@ -439,6 +439,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value
                         // TODO: alloc policy; at the moment we go conservative
                         o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz);
                         o->free = 0;
+                        dest_items = o->items;
                     }
                     mp_seq_replace_slice_grow_inplace(dest_items, o->len,
                         slice.start, slice.stop, src_items, src_len, len_adj, item_sz);
diff --git a/tests/basics/bytearray_slice_assign.py b/tests/basics/bytearray_slice_assign.py
@@ -47,6 +47,9 @@
 b[2:] = bytearray(10)
 print(b)
 
+b = bytearray(10)
+b[:-1] = bytearray(500)
+print(len(b), b[0], b[-1])
 
 # Assignment of bytes to array slice
 b = bytearray(2)

Original file line number	Diff line number	Diff line change
`@@ -439,6 +439,7 @@ STATIC mp_obj_t array_subscr(mp_obj_t self_in, mp_obj_t index_in, mp_obj_t value`
`439`	`439`	`// TODO: alloc policy; at the moment we go conservative`
`440`	`440`	`o->items = m_renew(byte, o->items, (o->len + o->free) * item_sz, (o->len + len_adj) * item_sz);`
`441`	`441`	`o->free = 0;`
	`442`	`+ dest_items = o->items;`
`442`	`443`	`}`
`443`	`444`	`mp_seq_replace_slice_grow_inplace(dest_items, o->len,`
`444`	`445`	`slice.start, slice.stop, src_items, src_len, len_adj, item_sz);`