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

Jump to bottom
Closed
wants to merge 4 commits into from
Closed

unix: avoid crashing after heap lock in REPL #17965

wants to merge 4 commits into from

Conversation

jepler
Copy link
Contributor

@jepler jepler commented Aug 20, 2025 •
edited
Loading

Summary

Closes: #17934

There were 3 distinct scenarios I ran into:

Lock the heap, then type a long line:

>>> micropython.heap_lock()
>>> ffffffffffffffffffffffffffffffffffffffffFATAL: uncaught NLR 0x5555557593d0

Testing

I manually tested each variation I had discovered. I also added a CI-time test though I'm not 100% sure it's correct.

@codecov Codecov
Copy link

codecov bot commented Aug 20, 2025 •
edited
Loading

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 98.38%. Comparing base (3adf016) to head (5c804a4).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #17965   +/-   ##
=======================================
  Coverage   98.38%   98.38%           
=======================================
  Files         171      171           
  Lines       22296    22296           
=======================================
  Hits        21937    21937           
  Misses        359      359

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@github-actions GitHub Actions
Copy link

github-actions bot commented Aug 20, 2025 •
edited
Loading

Code size report:

   bare-arm:    +0 +0.000% 
minimal x86:   -13 -0.007% 
   unix x64:   +24 +0.003% standard
      stm32:    -4 -0.001% PYBV10
     mimxrt:    +0 +0.000% TEENSY40
        rp2:    -8 -0.001% RPI_PICO_W
       samd:    +0 +0.000% ADAFRUIT_ITSYBITSY_M4_EXPRESS
  qemu rv32:    -6 -0.001% VIRT_RV32

dpgeorge
dpgeorge reviewed Sep 2, 2025
View reviewed changes
@jepler
unix: Don't crash if heap locked in prompt_write_history.
30c1b6e 
Signed-off-by: Jeff Epler <jepler@gmail.com>
@jepler
unix: Unlock heap before readline.
6ad91f2 
This is intended to be equivalent to the unlock in
shared/runtime/pyexec.c.

Signed-off-by: Jeff Epler <jepler@gmail.com>
@jepler
tests: Add test for heap lock in REPL.
a791f7f 
Signed-off-by: Jeff Epler <jepler@gmail.com>
@jepler
pyexec: Unconditionally reset lock depth.
5c804a4 
Signed-off-by: Jeff Epler <jepler@gmail.com>
dpgeorge
dpgeorge approved these changes Sep 2, 2025
View reviewed changes
Copy link
Member

@dpgeorge dpgeorge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will clash somewhat with #12802. But the PR here makes a good (small) step in the right direction, and adds a good test, so we can merge it.

@dpgeorge
Copy link
Member

dpgeorge commented Sep 2, 2025

Merged in 30c1b6e through 4db2cf0

@dpgeorge dpgeorge closed this Sep 2, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dpgeorge dpgeorge dpgeorge approved these changes

Assignees
No one assigned
Labels
port-unix
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

"FATAL: uncaught NLR" with repl + heap lock
2 participants
@jepler @dpgeorge