mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
(re-commit of r26522 since forgot to add a change, sorry) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
323d23c44b
commit
3a9ce187de
3 changed files with 17 additions and 5 deletions
|
@ -1,13 +1,13 @@
|
|||
Sun Jan 31 21:10:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
|
||||
|
||||
Sun Jan 31 21:29:58 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* lib/rexml/text.rb (REXML::Text#initialize): do Text.check only when
|
||||
parent is specified, since Text.check may need doctype. partially
|
||||
revert r26518.
|
||||
|
||||
Sun Jan 31 21:10:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* vm_insnhelper.c (vm_throw): fixed infinite loop. [ruby-core:27969]
|
||||
|
||||
Sun Jan 31 15:50:34 2010 Yusuke Endoh <mame@tsg.ne.jp>
|
||||
|
||||
* lib/rexml/text.rb (REXML::Text#initialize): fix typo and a bug that
|
||||
|
|
|
@ -259,3 +259,15 @@ assert_normal_exit %q{
|
|||
end
|
||||
end
|
||||
}
|
||||
|
||||
assert_normal_exit %q{
|
||||
-> do
|
||||
1.times do
|
||||
begin
|
||||
raise
|
||||
rescue
|
||||
return
|
||||
end
|
||||
end
|
||||
end.call
|
||||
}
|
||||
|
|
|
@ -1491,7 +1491,7 @@ vm_throw(rb_thread_t *th, rb_control_frame_t *reg_cfp,
|
|||
dfp = cfp->dfp;
|
||||
goto valid_return;
|
||||
}
|
||||
tdfp = GC_GUARDED_PTR_REF((VALUE *)*dfp);
|
||||
tdfp = GC_GUARDED_PTR_REF((VALUE *)*tdfp);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue