1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* marshal.c (marshal_dump, marshal_load): prevent from GC.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-10-10 15:14:40 +00:00
parent 89afd642aa
commit 95b3da63f1
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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> Sat Oct 10 23:57:44 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (path_check_0): prevent from GC. * file.c (path_check_0): prevent from GC.

5
marshal.c
View File

@ -897,7 +897,7 @@ marshal_dump(int argc, VALUE *argv)
VALUE obj, port, a1, a2; VALUE obj, port, a1, a2;
int limit = -1; int limit = -1;
struct dump_arg *arg; struct dump_arg *arg;
VALUE wrapper; volatile VALUE wrapper;
port = Qnil; port = Qnil;
rb_scan_args(argc, argv, "12", &obj, &a1, &a2); rb_scan_args(argc, argv, "12", &obj, &a1, &a2);
@ -1737,7 +1737,8 @@ marshal_load(int argc, VALUE *argv)
{ {
VALUE port, proc; VALUE port, proc;
int major, minor, taint = FALSE; int major, minor, taint = FALSE;
VALUE v, wrapper; VALUE v;
volatile VALUE wrapper;
struct load_arg *arg; struct load_arg *arg;
rb_scan_args(argc, argv, "11", &port, &proc); rb_scan_args(argc, argv, "11", &port, &proc);

4
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2" #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_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk" #define RUBY_BRANCH_NAME "trunk"
@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10
#define RUBY_RELEASE_DAY 10 #define RUBY_RELEASE_DAY 11
#include "ruby/version.h" #include "ruby/version.h"