diff --git a/ChangeLog b/ChangeLog index 1f555b2c09..beac0a6f6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sun Oct 11 00:14:38 2009 Nobuyoshi Nakada + + * marshal.c (marshal_dump, marshal_load): prevent from GC. + Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada * file.c (path_check_0): prevent from GC. diff --git a/marshal.c b/marshal.c index 58128ef0d5..fb2cd7e5d7 100644 --- a/marshal.c +++ b/marshal.c @@ -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); diff --git a/version.h b/version.h index 6d13115cae..a617858865 100644 --- a/version.h +++ b/version.h @@ -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"