Merge pull request #3355 from jepler/import-builtin-submodule-crash-unix

tannewt · web-flow · commit 877a4f47cc90 · 2020-08-31T14:44:18.000-07:00
builtinimport: Fix a crash with 'import ulab.linalg' on unix port only
diff --git a/py/builtinimport.c b/py/builtinimport.c
@@ -488,7 +488,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
                 // afterwards.
                 gc_collect();
             }
-            if (outer_module_obj != MP_OBJ_NULL) {
+            if (outer_module_obj != MP_OBJ_NULL && VERIFY_PTR(outer_module_obj) ) {
                 qstr s = qstr_from_strn(mod_str + last, i - last);
                 mp_store_attr(outer_module_obj, s, module_obj);
                 // The above store can cause a dictionary rehash and new allocation. So,

Original file line number	Diff line number	Diff line change
`@@ -488,7 +488,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {`
`488`	`488`	`// afterwards.`
`489`	`489`	`gc_collect();`
`490`	`490`	`}`
`491`		`- if (outer_module_obj != MP_OBJ_NULL) {`
	`491`	`+ if (outer_module_obj != MP_OBJ_NULL && VERIFY_PTR(outer_module_obj) ) {`
`492`	`492`	`qstr s = qstr_from_strn(mod_str + last, i - last);`
`493`	`493`	`mp_store_attr(outer_module_obj, s, module_obj);`
`494`	`494`	`// The above store can cause a dictionary rehash and new allocation. So,`