summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-11 08:52:16 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-11 08:52:16 +0000
commit485c571bf1c95875c33a3309cf1ce58d3518f167 (patch)
treec03c722f8ca12aa05f13fe3f595de32a795f9ebd
parentaeed74a61a8bde71d5787fa960a62b388f6fea4d (diff)
* vm.c (vm_exec): reset thread state before restarting vm loop
from catch scope. [ruby-core:28129], [ruby-core:28143] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0cce04f0a6..ed44ff519c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 11 17:52:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm.c (vm_exec): reset thread state before restarting vm loop
+ from catch scope. [ruby-core:28129], [ruby-core:28143]
+
Thu Feb 11 14:43:16 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_object0): read sequentially since marshal source
diff --git a/vm.c b/vm.c
index 1cee9833518..e963225ae8c 100644
--- a/vm.c
+++ b/vm.c
@@ -1303,6 +1303,7 @@ vm_exec(rb_thread_t *th)
cfp->sp + 1 /* push value */, cfp->lfp, catch_iseq->local_size - 1);
state = 0;
+ th->state = 0;
th->errinfo = Qnil;
goto vm_loop_start;
}