akr	2007-12-13 20:10:46 +0900 (Thu, 13 Dec 2007)

  New Revision: 14214

  Modified files:
    trunk/ChangeLog
    trunk/eval.c

  Log:
    * eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
      'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
      on IA64.


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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14213)
+++ ChangeLog	(revision 14214)
@@ -1,3 +1,9 @@
+Thu Dec 13 20:09:09 2007  Tanaka Akira  <akr@f...>
+
+	* eval.c (rb_protect): restore root_jmpbuf to avoid SEGV by
+	  'IO.pipe; [].each.next' with gcc version 3.3.5 (Debian 1:3.3.5-13)
+	  on IA64.
+
 Thu Dec 13 17:51:54 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* string.c (rb_str_split_m): need not to check encoding if regexp
Index: eval.c
===================================================================
--- eval.c	(revision 14213)
+++ eval.c	(revision 14214)
@@ -1182,7 +1182,10 @@
     PUSH_TAG();
     th->trap_tag = &trap_tag;
     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);
     }
     th->trap_tag = trap_tag.prev;
     POP_TAG();

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