akr	2007-12-14 08:19:14 +0900 (Fri, 14 Dec 2007)

  New Revision: 14222

  Modified files:
    trunk/ChangeLog
    trunk/eval.c

  Log:
    * eval.c (rb_protect): restore root_jmpbuf even if proc exits by
      break such as dbm.delete_if { break }.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14222&r2=14221
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval.c?r1=14222&r2=14221

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14221)
+++ ChangeLog	(revision 14222)
@@ -1,3 +1,8 @@
+Fri Dec 14 08:17:24 2007  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* string.c (str_nth): direct jump if string is 7bit only.  great
Index: eval.c
===================================================================
--- eval.c	(revision 14221)
+++ eval.c	(revision 14222)
@@ -1176,17 +1176,17 @@
     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();
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml