diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-10 15:14:40 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-10 15:14:40 +0000 |
commit | 95b3da63f1daa29666c3ee1d703e9ad944f34b25 (patch) | |
tree | 4911e63f4cc420619bdae1c0e79670d2246c4097 | |
parent | 89afd642aa8a28915f224bba8b475140268b7a64 (diff) | |
download | ruby-95b3da63f1daa29666c3ee1d703e9ad944f34b25.tar.gz |
* marshal.c (marshal_dump, marshal_load): prevent from GC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | marshal.c | 5 | ||||
-rw-r--r-- | version.h | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (marshal_dump, marshal_load): prevent from GC. + Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (path_check_0): prevent from GC. @@ -897,7 +897,7 @@ marshal_dump(int argc, VALUE *argv) VALUE obj, port, a1, a2; int limit = -1; struct dump_arg *arg; - VALUE wrapper; + volatile VALUE wrapper; port = Qnil; rb_scan_args(argc, argv, "12", &obj, &a1, &a2); @@ -1737,7 +1737,8 @@ marshal_load(int argc, VALUE *argv) { VALUE port, proc; int major, minor, taint = FALSE; - VALUE v, wrapper; + VALUE v; + volatile VALUE wrapper; struct load_arg *arg; rb_scan_args(argc, argv, "11", &port, &proc); @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_RELEASE_DATE "2009-10-10" +#define RUBY_RELEASE_DATE "2009-10-11" #define RUBY_PATCHLEVEL -1 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 10 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 11 #include "ruby/version.h" |