diff options
| author | Dan Halbert <halbert@halwitz.org> | 2018-01-23 20:54:02 -0500 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2018-01-23 20:54:02 -0500 |
| commit | 4b1e9d8f92aa948f8ecccf364edcb911a135f2c8 (patch) | |
| tree | 9eeae0c057397a27784e93fe3b58ae2102c10d38 /py/runtime.c | |
| parent | fe851fc15e2f02734133c9a2874bf3b407332f65 (diff) | |
alloca seems buggy on M4
Diffstat (limited to 'py/runtime.c')
| -rw-r--r-- | py/runtime.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/py/runtime.c b/py/runtime.c index cbec82f17..7a16e4a1b 100644 --- a/py/runtime.c +++ b/py/runtime.c @@ -1428,9 +1428,10 @@ import_error: 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)); |
