From fcfc69e1d5ed72819bba2f35498e6d2722dda87a Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 13:04:24 +0000 Subject: merge revision(s) 15965: * marshal.c (w_object): add volatile to avoid potential GC bug. a patch from Tomoyuki Chikanaga 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 --- ChangeLog | 6 ++++++ marshal.c | 2 +- version.h | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35d8b31323..2e01d4e35a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 22:03:36 2008 Yukihiro Matsumoto + + * marshal.c (w_object): add volatile to avoid potential GC bug. a + patch from Tomoyuki Chikanaga + in [ruby-dev:34311]. + Sun Jun 15 21:57:19 2008 Yukihiro Matsumoto * re.c (rb_reg_quote): should always copy the quoting string. diff --git a/marshal.c b/marshal.c index cccf26fd7b..39f9cc7478 100644 --- a/marshal.c +++ b/marshal.c @@ -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); diff --git a/version.h b/version.h index 55d4187e01..338d93b42a 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3