summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:05:07 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-15 13:05:07 +0000
commit3dd98cb1a51484fbe253d56615fc50bf16611084 (patch)
tree8db788cc85d1f2da1de745b0fb64b31caed2b9ab
parentd9630cc1a1290462c4219a4a7e01fd606fd4b24b (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_6@17238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--marshal.c2
-rw-r--r--version.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 93bf114..96afef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Jun 15 22:04:44 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:59:22 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* re.c (rb_reg_quote): should always copy the quoting string.
diff --git a/marshal.c b/marshal.c
index f97b3b8..256775b 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 6573128..43c8042 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2008-06-15"
#define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20080615
-#define RUBY_PATCHLEVEL 193
+#define RUBY_PATCHLEVEL 194
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8