diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Fri Dec 14 08:17:24 2007 Tanaka Akira <akr@fsij.org> + + * eval.c (rb_protect): restore root_jmpbuf even if proc exits by + break such as dbm.delete_if { break }. + Fri Dec 14 02:55:41 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * string.c (str_nth): direct jump if string is 7bit only. great @@ -1176,17 +1176,17 @@ rb_protect(VALUE (*proc) (VALUE), VALUE data, int *state) rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = th->cfp; struct rb_vm_trap_tag trap_tag; + rb_jmpbuf_t org_jmpbuf; trap_tag.prev = th->trap_tag; PUSH_TAG(); th->trap_tag = &trap_tag; + MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1); if ((status = EXEC_TAG()) == 0) { - rb_jmpbuf_t org_jmpbuf; - MEMCPY(&org_jmpbuf, &(th)->root_jmpbuf, rb_jmpbuf_t, 1); SAVE_ROOT_JMPBUF(th, result = (*proc) (data)); - MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1); } + MEMCPY(&(th)->root_jmpbuf, &org_jmpbuf, rb_jmpbuf_t, 1); th->trap_tag = trap_tag.prev; POP_TAG(); |