summaryrefslogtreecommitdiffhomepage
path: root/src/state.c
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2021-02-02 10:57:32 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2021-02-02 10:57:32 +0900
commit6cc52b3210524192af50cc3bc4ac5c236cc5cdd5 (patch)
treed1801867ea539ae8a7ba1a2682ac8e7451756ce9 /src/state.c
parentd759a73525f2bff367433454e4d2851f7c193693 (diff)
downloadmruby-6cc52b3210524192af50cc3bc4ac5c236cc5cdd5.tar.gz
mruby-6cc52b3210524192af50cc3bc4ac5c236cc5cdd5.zip
Ignore errors from `atexit` finalizers.
Diffstat (limited to 'src/state.c')
-rw-r--r--src/state.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/state.c b/src/state.c
index 5da2675ac..95c070deb 100644
--- a/src/state.c
+++ b/src/state.c
@@ -12,6 +12,7 @@
#include <mruby/debug.h>
#include <mruby/string.h>
#include <mruby/class.h>
+#include <mruby/throw.h>
void mrb_init_core(mrb_state*);
void mrb_init_mrbgems(mrb_state*);
@@ -181,9 +182,16 @@ mrb_close(mrb_state *mrb)
{
if (!mrb) return;
if (mrb->atexit_stack_len > 0) {
- mrb_int i;
- for (i = mrb->atexit_stack_len; i > 0; --i) {
- mrb->atexit_stack[i - 1](mrb);
+ struct mrb_jmpbuf *prev_jmp = mrb->jmp;
+ struct mrb_jmpbuf c_jmp;
+ for (int i = mrb->atexit_stack_len; i > 0; --i) {
+ MRB_TRY(&c_jmp) {
+ mrb->jmp = &c_jmp;
+ mrb->atexit_stack[i - 1](mrb);
+ mrb->jmp = prev_jmp;
+ } MRB_CATCH(&c_jmp) {
+ /* ignore atexit errors */
+ } MRB_END_EXC(&c_jmp);
}
#ifndef MRB_FIXED_STATE_ATEXIT_STACK
mrb_free(mrb, mrb->atexit_stack);