diff options
| author | Damien George <damien@micropython.org> | 2021-05-18 00:23:13 +1000 |
|---|---|---|
| committer | Damien George <damien@micropython.org> | 2021-05-18 10:18:56 +1000 |
| commit | 6d2680fa36696fd0b2fd7a595f4a26153cd84e07 (patch) | |
| tree | f706f1f523bd5c0b135e66fb1aa4b7a48920096b /py/objarray.c | |
| parent | 1446107b4d24915143f8212c2f649a0e628735cc (diff) | |
py/objarray: Fix constructing a memoryview from a memoryview.
Fixes issue #7261.
Signed-off-by: Damien George <damien@micropython.org>
Diffstat (limited to 'py/objarray.c')
| -rw-r--r-- | py/objarray.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/py/objarray.c b/py/objarray.c index be85674f8..16a4d4aac 100644 --- a/py/objarray.c +++ b/py/objarray.c @@ -220,6 +220,14 @@ STATIC mp_obj_t memoryview_make_new(const mp_obj_type_t *type_in, size_t n_args, bufinfo.len / mp_binary_get_size('@', bufinfo.typecode, NULL), bufinfo.buf)); + // If the input object is a memoryview then need to point the items of the + // new memoryview to the start of the buffer so the GC can trace it. + if (mp_obj_get_type(args[0]) == &mp_type_memoryview) { + mp_obj_array_t *other = MP_OBJ_TO_PTR(args[0]); + self->memview_offset = other->memview_offset; + self->items = other->items; + } + // test if the object can be written to if (mp_get_buffer(args[0], &bufinfo, MP_BUFFER_RW)) { self->typecode |= MP_OBJ_ARRAY_TYPECODE_FLAG_RW; // indicate writable buffer |
