Validate builtin member is a module

tannewt · tannewt · commit 6375d8699e84 · 2020-02-26T10:32:02.000-08:00
diff --git a/py/builtinimport.c b/py/builtinimport.c
@@ -421,7 +421,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
                                        MP_MAP_LOOKUP);
                 }
 
-                if (el != NULL) {
+                if (el != NULL && MP_OBJ_IS_TYPE(el->value, &mp_type_module)) {
                     module_obj = el->value;
                     mp_module_call_init(mod_name, module_obj);
                 } else {

Original file line number	Diff line number	Diff line change
`@@ -421,7 +421,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {`
`421`	`421`	`MP_MAP_LOOKUP);`
`422`	`422`	`}`
`423`	`423`
`424`		`- if (el != NULL) {`
	`424`	`+ if (el != NULL && MP_OBJ_IS_TYPE(el->value, &mp_type_module)) {`
`425`	`425`	`module_obj = el->value;`
`426`	`426`	`mp_module_call_init(mod_name, module_obj);`
`427`	`427`	`} else {`