diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:04:24 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-15 13:04:24 +0000 |
commit | fcfc69e1d5ed72819bba2f35498e6d2722dda87a (patch) | |
tree | 3ddf5f05316538dad89467945539296da471aab4 | |
parent | 67e558f07978c96ed7b9ca920bea771745e300e0 (diff) |
merge revision(s) 15965:
* marshal.c (w_object): add volatile to avoid potential GC bug. a
patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp>
in [ruby-dev:34311].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | marshal.c | 2 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Sun Jun 15 22:03:36 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * marshal.c (w_object): add volatile to avoid potential GC bug. a + patch from Tomoyuki Chikanaga <chikanag at nippon-control-system.co.jp> + in [ruby-dev:34311]. + Sun Jun 15 21:57:19 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * re.c (rb_reg_quote): should always copy the quoting string. @@ -502,7 +502,7 @@ w_object(obj, arg, limit) st_add_direct(arg->data, obj, arg->data->num_entries); if (rb_respond_to(obj, s_mdump)) { - VALUE v; + volatile VALUE v; v = rb_funcall(obj, s_mdump, 0, 0); w_class(TYPE_USRMARSHAL, obj, arg, Qfalse); @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 192 +#define RUBY_PATCHLEVEL 193 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |