StackRduino
diff --git a/‎extmod/modure.c‎
Lines changed: 1 addition & 1 deletion b/‎extmod/modure.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/builtinimport.c‎
Lines changed: 1 addition & 1 deletion b/‎py/builtinimport.c‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎py/runtime.c‎
Lines changed: 3 additions & 2 deletions b/‎py/runtime.c‎
Lines changed: 3 additions & 2 deletions
@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {
     }
 
     mp_obj_t retval = mp_obj_new_list(0, NULL);
-    const char **caps = alloca(caps_num * sizeof(char*));
+    const char* caps[caps_num];
     while (true) {
         // cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char
         memset((char**)caps, 0, caps_num * sizeof(char*));
 
@@ -330,7 +330,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {
         }
 
         uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);
-        char *new_mod = alloca(new_mod_l);
+        char new_mod[new_mod_l];
         memcpy(new_mod, this_name, p - this_name);
         if (mod_len != 0) {
             new_mod[p - this_name] = '.';
 
@@ -1428,9 +1428,10 @@ mp_obj_t mp_import_from(mp_obj_t module, qstr name) {
     mp_load_method_maybe(module, MP_QSTR___name__, dest);
     size_t pkg_name_len;
     const char *pkg_name = mp_obj_str_get_data(dest[0], &pkg_name_len);
-
     const uint dot_name_len = pkg_name_len + 1 + qstr_len(name);
-    char *dot_name = alloca(dot_name_len);
+    // Previously dot_name was created using alloca(), but that caused run-time crashes on M4 due to
+    // stack corruption (compiler bug, it appears), so use an array instead.
+    char dot_name[dot_name_len];
     memcpy(dot_name, pkg_name, pkg_name_len);
     dot_name[pkg_name_len] = '.';
     memcpy(dot_name + pkg_name_len + 1, qstr_str(name), qstr_len(name));
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ STATIC mp_obj_t re_split(size_t n_args, const mp_obj_t *args) {`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`mp_obj_t retval = mp_obj_new_list(0, NULL);`
`147`		`- const char *caps = alloca(caps_num sizeof(char*));`
	`147`	`+ const char* caps[caps_num];`
`148`	`148`	`while (true) {`
`149`	`149`	`// cast is a workaround for a bug in msvc: it treats const char** as a const pointer instead of a pointer to pointer to const char`
`150`	`150`	`memset((char*)caps, 0, caps_num sizeof(char*));`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ mp_obj_t mp_builtin___import__(size_t n_args, const mp_obj_t *args) {`
`330`	`330`	`}`
`331`	`331`
`332`	`332`	`uint new_mod_l = (mod_len == 0 ? (size_t)(p - this_name) : (size_t)(p - this_name) + 1 + mod_len);`
`333`		`- char *new_mod = alloca(new_mod_l);`
	`333`	`+ char new_mod[new_mod_l];`
`334`	`334`	`memcpy(new_mod, this_name, p - this_name);`
`335`	`335`	`if (mod_len != 0) {`
`336`	`336`	`new_mod[p - this_name] = '.';`