py/objstr: Sanitise the type passed to mp_obj_new_str_from_vstr.

andrewleech · pi-anl · commit f1c61a6413b9 · 2022-02-02T21:37:31.000+11:00
diff --git a/py/objstr.c b/py/objstr.c
@@ -2067,6 +2067,8 @@ mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t *type, vstr_t *vstr) {
             vstr->alloc = 0;
             return MP_OBJ_NEW_QSTR(q);
         }
+    } else {
+        type = &mp_type_bytes;
     }
 
     // make a new str/bytes object

Original file line number	Diff line number	Diff line change
`@@ -2067,6 +2067,8 @@ mp_obj_t mp_obj_new_str_from_vstr(const mp_obj_type_t type, vstr_t vstr) {`
`2067`	`2067`	`vstr->alloc = 0;`
`2068`	`2068`	`return MP_OBJ_NEW_QSTR(q);`
`2069`	`2069`	`}`
	`2070`	`+ } else {`
	`2071`	`+ type = &mp_type_bytes;`
`2070`	`2072`	`}`
`2071`	`2073`
`2072`	`2074`	`// make a new str/bytes object`