diff options
author | Kaz Kylheku <kaz@kylheku.com> | 2016-10-26 06:56:04 -0700 |
---|---|---|
committer | Kaz Kylheku <kaz@kylheku.com> | 2016-10-26 06:56:04 -0700 |
commit | ea81292fa7d10df029d1e938e086bed648ab1120 (patch) | |
tree | b022196267784a5ae3e0717fab206eab1fc20e4b /glob.c | |
parent | c2d87ddcd9e18d7088448533ba8203cd9a8a042e (diff) | |
download | txr-ea81292fa7d10df029d1e938e086bed648ab1120.tar.gz txr-ea81292fa7d10df029d1e938e086bed648ab1120.tar.bz2 txr-ea81292fa7d10df029d1e938e086bed648ab1120.zip |
Let guard frames optionally pass through unwinding.
We have a bug in that when an exception occurs in a context
called from obj_print, the guard for stopping continuation
captures across obj_print also unintentially blocks the
unwinding. Let's make the unwinding blockage optional
* unwind.c (uw_unwind_to_exit_point): If a UW_GUARD is
encountered, do not abort if the uw_ok flag is set;
keep unwinding.
(uw_push_guard): New uw_ok argument, initializes the
uw_ok member of a guard frame.
* unwind.h (struct uw_guard): New struct type.
(union uw_frame): New member gu of type struct uw_guard.
(uw_push_guard): Declaration updated.
* ftw.c (ftw_callback): Pass zero as new uw_push_guard
argument: no unwinding across the POSIX library function ftw.
* glob.c (errfunc_thunk): Likewise, no unwinding across
the library function glob.
* lib.c (obj_print): Pass 1 as new uw_push_guard argument:
continuations can't be captured, but unwinding is okay.
Diffstat (limited to 'glob.c')
-rw-r--r-- | glob.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -47,7 +47,7 @@ static int errfunc_thunk(const char *errpath, int errcode) val result = t; uw_frame_t cont_guard; - uw_push_guard(&cont_guard); + uw_push_guard(&cont_guard, 0); uw_simple_catch_begin; |