diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:50:21 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-02-22 05:50:21 +0000 |
commit | 857a2ceef5960dc5c526172690eab7a40a532e2c (patch) | |
tree | 9d161a631b222b9f628890d06bc5703abd405369 | |
parent | 0bf5cc03228043e17871529b546f279910e970e2 (diff) |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | vm.c | 1 |
3 files changed, 7 insertions, 1 deletions
@@ -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. @@ -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 @@ -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; } |