summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-10 23:10:49 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-04-10 23:10:49 +0000
commit4a407ec3a7be0b6d92b9a9b68c5d10b041f1120e (patch)
tree89176ae821e80191a9a4de3891d21060f8d7896a
parent1e8ec51e8fafc27f170241f93868528dd22861d4 (diff)
downloadruby-4a407ec3a7be0b6d92b9a9b68c5d10b041f1120e.tar.gz
* 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/trunk@15966 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--marshal.c2
-rw-r--r--version.h6
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 54dc9fae07..f06efb9f32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 11 08:05:12 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].
+
Thu Apr 10 23:08:52 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/pstore.rb (PStore::dump, PStore::load): allow subclass
diff --git a/marshal.c b/marshal.c
index bbe8ba0e27..723f8dde33 100644
--- a/marshal.c
+++ b/marshal.c
@@ -575,7 +575,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
if (rb_respond_to(obj, s_mdump)) {
- VALUE v;
+ volatile VALUE v;
st_add_direct(arg->data, obj, arg->data->num_entries);
diff --git a/version.h b/version.h
index 30be020bde..c6e9b9f6d1 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-04-10"
+#define RUBY_RELEASE_DATE "2008-04-11"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080410
+#define RUBY_RELEASE_CODE 20080411
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];