diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 13:04:52 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-22 13:04:52 +0000 |
commit | cb016e3224a2dc20b5bb958e8572a438d197594a (patch) | |
tree | 62c2c275c8a9d4192996ce8e5a7c1a5de99fb882 /version.h | |
parent | 6cec674877a48c64201254e80b76dfdab126b750 (diff) |
merge revision(s) 21353:
* eval.c (cc_mark): frees the continuation's stack if its thread
is dead to avoid recursive gc that segfaults. [ruby-core:13889]
a patch by Brent Roman <brent AT mbari.org>.
* eval.c (rb_cont_check): checks for valid continuation instance.
* eval.c (rb_callcc): assigns th->thread before scope_dup() to
avoid segfaults if this scope_dup() triggers a gc pass.
a patch by Brent Roman <brent AT mbari.org>.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@22540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'version.h')
-rw-r--r-- | version.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2009-02-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20090222 -#define RUBY_PATCHLEVEL 137 +#define RUBY_PATCHLEVEL 138 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |