* vm.c (vm_exec): get rid of a SEGV when calling rb_iter_break() from

  some extention libraries.  [Backport #7896] [ruby-core:52607]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@39381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index bae494330f..e9c80a655e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 22 14:48:15 2013  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* vm.c (vm_exec): get rid of a SEGV when calling rb_iter_break() from
+	  some extention libraries. [Backport #7896] [ruby-core:52607]
+
 Fri Feb 22 14:40:57 2013  Narihiro Nakamura  <authornari@gmail.com>
 
 	* gc.c : remove a unused function.
diff --git a/version.h b/version.h
index 3f681381ff..6cfc67a7ed 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 390
+#define RUBY_PATCHLEVEL 391
 
 #define RUBY_RELEASE_DATE "2013-02-22"
 #define RUBY_RELEASE_YEAR 2013
diff --git a/vm.c b/vm.c
index 4c44aa4a41..6b2bd907ff 100644
--- a/vm.c
+++ b/vm.c
@@ -1370,6 +1370,7 @@ vm_exec(rb_thread_t *th)
 			    *th->cfp->sp++ = (GET_THROWOBJ_VAL(err));
 #endif
 			}
+			th->state = 0;
 			th->errinfo = Qnil;
 			goto vm_loop_start;
 		    }