2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c0cce04f0a..ed44ff519c 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 1cee983351..e963225ae8 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;
 	}