Merge pull request #2334 from natalie-lang/thread-system-exit

Fix SystemExit segfault for non-main threads
natalie-lang · Nov 14, 2024 · 1dacb3d · 1dacb3d
2 parents 9bb0ca9 + e615da3
commit 1dacb3d
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/natalie.cpp b/src/natalie.cpp
@@ -837,10 +837,12 @@ Value super(Env *env, Value self, Args args, Block *block) {
 }
 
 void clean_up_and_exit(int status) {
-    ThreadObject::detach_all();
-    if (Heap::the().collect_all_at_exit()) {
-        delete &Heap::the();
-        delete NativeProfiler::the();
+    if (ThreadObject::i_am_main()) {
+        ThreadObject::detach_all();
+        if (Heap::the().collect_all_at_exit()) {
+            delete &Heap::the();
+            delete NativeProfiler::the();
+        }
     }
     exit(status);
 }