mame	2010-01-31 21:41:47 +0900 (Sun, 31 Jan 2010)

  New Revision: 26524

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26524

  Log:
    * vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
      (re-commit of r26522 since forgot to add a change, sorry)

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_jump.rb
    trunk/vm_insnhelper.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26523)
+++ ChangeLog	(revision 26524)
@@ -1,3 +1,7 @@
+Sun Jan 31 21:10:15 2010  Yusuke Endoh  <mame@t...>
+
+	* vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
+
 Sun Jan 31 21:29:58 2010  Yusuke Endoh  <mame@t...>
 
 	* lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
@@ -4,10 +8,6 @@
 	  parent is specified, since Text.check may need doctype.  partially
 	  revert r26518.
 
-Sun Jan 31 21:10:15 2010  Yusuke Endoh  <mame@t...>
-
-	* vm_insnhelper.c (vm_throw): fixed infinite loop.  [ruby-core:27969]
-
 Sun Jan 31 15:50:34 2010  Yusuke Endoh  <mame@t...>
 
 	* lib/rexml/text.rb (REXML::Text#initialize): fix typo and a bug that
Index: bootstraptest/test_jump.rb
===================================================================
--- bootstraptest/test_jump.rb	(revision 26523)
+++ bootstraptest/test_jump.rb	(revision 26524)
@@ -259,3 +259,15 @@
     end
   end
 }
+
+assert_normal_exit %q{
+  -> do
+    1.times do
+      begin
+        raise
+      rescue
+        return
+      end
+    end
+  end.call
+}
Index: vm_insnhelper.c
===================================================================
--- vm_insnhelper.c	(revision 26523)
+++ vm_insnhelper.c	(revision 26524)
@@ -1491,7 +1491,7 @@
 				    dfp = cfp->dfp;
 				    goto valid_return;
 				}
-				tdfp = GC_GUARDED_PTR_REF((VALUE *)*dfp);
+				tdfp = GC_GUARDED_PTR_REF((VALUE *)*tdfp);
 			    }
 			}
 		    }

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