Skip to content

unix: avoid crashing after heap lock in REPL #17965

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+25 −0
Open

unix: avoid crashing after heap lock in REPL #17965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e596c6
unix: Don't crash if heap locked in prompt_write_history.
jepler Aug 20, 2025
065f13b
unix: Unlock heap before readline.
jepler Aug 20, 2025
3bad046
tests: Add test for heap lock in REPL.
jepler Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ports/unix/input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ void prompt_write_history(void) {
#if MICROPY_USE_READLINE == 1
char *home = getenv("HOME");
if (home != NULL) {
if (MP_STATE_THREAD(gc_lock_depth) != 0) {
return;
}
vstr_t vstr;
vstr_init(&vstr, 50);
vstr_printf(&vstr, "%s/.micropython.history", home);
Expand Down
5 changes: 5 additions & 0 deletions ports/unix/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,11 @@ static int do_repl(void) {
mp_hal_stdio_mode_raw();

input_restart:
// If the GC is locked at this point there is no way out except a reset,
// so force the GC to be unlocked to help the user debug what went wrong.
if (MP_STATE_THREAD(gc_lock_depth) != 0) {
MP_STATE_THREAD(gc_lock_depth) = 0;
}
vstr_reset(&line);
int ret = readline(&line, mp_repl_get_ps1());
mp_parse_input_kind_t parse_input_kind = MP_PARSE_SINGLE_INPUT;
Expand Down
7 changes: 7 additions & 0 deletions tests/cmdline/repl_lock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import micropython
micropython.heap_lock()
1+1
micropython.heap_lock()
####################################################################
micropython.heap_lock()
raise SystemExit
10 changes: 10 additions & 0 deletions tests/cmdline/repl_lock.py.exp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
MicroPython \.\+ version
Use \.\+
>>> import micropython
>>> micropython.heap_lock()
>>> 1+1
2
>>> micropython.heap_lock()
>>> ####################################################################
>>> micropython.heap_lock()
>>> raise SystemExit
Loading