ruby-changes:14252
From: shyouhei <ko1@a...>
Date: Mon, 14 Dec 2009 00:15:17 +0900 (JST)
Subject: [ruby-changes:14252] Ruby:r26076 (ruby_1_8_7): merge revision(s) 25230,25995:
shyouhei 2009-12-14 00:14:02 +0900 (Mon, 14 Dec 2009) New Revision: 26076 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26076 Log: merge revision(s) 25230,25995: * marshal.c (struct {dump,load}_arg): manage with dfree, instead of using local variable which may be moved by context switch. [ruby-dev:39425] * marshal.c (marshal_load): should set taintness. [ruby-dev:39723] Modified files: branches/ruby_1_8_7/ChangeLog branches/ruby_1_8_7/marshal.c branches/ruby_1_8_7/test/ruby/test_marshal.rb branches/ruby_1_8_7/version.h Index: ruby_1_8_7/ChangeLog =================================================================== --- ruby_1_8_7/ChangeLog (revision 26075) +++ ruby_1_8_7/ChangeLog (revision 26076) @@ -1,3 +1,13 @@ +Sun Dec 13 23:54:22 2009 Nobuyoshi Nakada <nobu@r...> + + * marshal.c (marshal_load): should set taintness. [ruby-dev:39723] + +Sun Dec 13 23:54:22 2009 Nobuyoshi Nakada <nobu@r...> + + * marshal.c (struct {dump,load}_arg): manage with dfree, instead + of using local variable which may be moved by context switch. + [ruby-dev:39425] + Wed Nov 25 17:42:33 2009 Nobuyoshi Nakada <nobu@r...> * io.c (io_fwrite): adjust stdio file position after direct write on Index: ruby_1_8_7/version.h =================================================================== --- ruby_1_8_7/version.h (revision 26075) +++ ruby_1_8_7/version.h (revision 26076) @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.7" -#define RUBY_RELEASE_DATE "2009-11-25" +#define RUBY_RELEASE_DATE "2009-12-13" #define RUBY_VERSION_CODE 187 -#define RUBY_RELEASE_CODE 20091125 -#define RUBY_PATCHLEVEL 225 +#define RUBY_RELEASE_CODE 20091213 +#define RUBY_PATCHLEVEL 226 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 7 #define RUBY_RELEASE_YEAR 2009 -#define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_MONTH 12 +#define RUBY_RELEASE_DAY 13 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8_7/marshal.c =================================================================== --- ruby_1_8_7/marshal.c (revision 26075) +++ ruby_1_8_7/marshal.c (revision 26076) @@ -85,12 +85,10 @@ static ID s_getc, s_read, s_write, s_binmode; struct dump_arg { - VALUE obj; VALUE str, dest; st_table *symbols; st_table *data; int taint; - VALUE wrapper; }; struct dump_call_arg { @@ -104,22 +102,32 @@ struct dump_arg *arg; ID sym; { - if (!DATA_PTR(arg->wrapper)) { + if (!arg->symbols) { rb_raise(rb_eRuntimeError, "Marshal.dump reentered at %s", rb_id2name(sym)); } } +static void clear_dump_arg _((struct dump_arg *arg)); + static void mark_dump_arg(ptr) void *ptr; { struct dump_arg *p = ptr; - if (!ptr) + if (!p->symbols) return; rb_mark_set(p->data); } +static void +free_dump_arg(ptr) + void *ptr; +{ + clear_dump_arg(ptr); + xfree(ptr); +} + static VALUE class2path(klass) VALUE klass; @@ -699,32 +707,17 @@ } } -static VALUE -dump(arg) - struct dump_call_arg *arg; -{ - w_object(arg->obj, arg->arg, arg->limit); - if (arg->arg->dest) { - rb_io_write(arg->arg->dest, arg->arg->str); - rb_str_resize(arg->arg->str, 0); - } - return 0; -} - -static VALUE -dump_ensure(arg) +static void +clear_dump_arg(arg) struct dump_arg *arg; { - if (!DATA_PTR(arg->wrapper)) return 0; + if (!arg->symbols) return; st_free_table(arg->symbols); + arg->symbols = 0; st_free_table(arg->data); - DATA_PTR(arg->wrapper) = 0; - arg->wrapper = 0; if (arg->taint) { OBJ_TAINT(arg->str); } - - return 0; } /* @@ -760,8 +753,8 @@ { VALUE obj, port, a1, a2; int limit = -1; - struct dump_arg arg; - struct dump_call_arg c_arg; + struct dump_arg *arg; + VALUE wrapper; port = Qnil; rb_scan_args(argc, argv, "12", &obj, &a1, &a2); @@ -775,37 +768,40 @@ else if (NIL_P(a1)) goto type_error; else port = a1; } - arg.dest = 0; - arg.symbols = st_init_numtable(); - arg.data = st_init_numtable(); - arg.taint = Qfalse; - arg.str = rb_str_buf_new(0); - RBASIC(arg.str)->klass = 0; - arg.wrapper = Data_Wrap_Struct(rb_cData, mark_dump_arg, 0, &arg); + wrapper = Data_Make_Struct(rb_cData, struct dump_arg, mark_dump_arg, free_dump_arg, arg); + arg->dest = 0; + arg->symbols = st_init_numtable(); + arg->data = st_init_numtable(); + arg->taint = Qfalse; + arg->str = rb_str_buf_new(0); + RBASIC(arg->str)->klass = 0; if (!NIL_P(port)) { if (!rb_respond_to(port, s_write)) { type_error: rb_raise(rb_eTypeError, "instance of IO needed"); } - arg.dest = port; + arg->dest = port; if (rb_respond_to(port, s_binmode)) { rb_funcall2(port, s_binmode, 0, 0); - check_dump_arg(&arg, s_binmode); + check_dump_arg(arg, s_binmode); } } else { - port = arg.str; + port = arg->str; } - c_arg.obj = obj; - c_arg.arg = &arg; - c_arg.limit = limit; + w_byte(MARSHAL_MAJOR, arg); + w_byte(MARSHAL_MINOR, arg); - w_byte(MARSHAL_MAJOR, &arg); - w_byte(MARSHAL_MINOR, &arg); + w_object(obj, arg, limit); + if (arg->dest) { + rb_io_write(arg->dest, arg->str); + rb_str_resize(arg->str, 0); + } - rb_ensure(dump, (VALUE)&c_arg, dump_ensure, (VALUE)&arg); - RBASIC(arg.str)->klass = rb_cString; + RBASIC(arg->str)->klass = rb_cString; + clear_dump_arg(arg); + RB_GC_GUARD(wrapper); return port; } @@ -817,7 +813,6 @@ st_table *data; VALUE proc; int taint; - VALUE wrapper; }; static void @@ -825,22 +820,31 @@ struct load_arg *arg; ID sym; { - if (!DATA_PTR(arg->wrapper)) { + if (!arg->symbols) { rb_raise(rb_eRuntimeError, "Marshal.load reentered at %s", rb_id2name(sym)); } } +static void clear_load_arg _((struct load_arg *arg)); + static void mark_load_arg(ptr) void *ptr; { struct load_arg *p = ptr; - if (!ptr) + if (!p->symbols) return; rb_mark_tbl(p->data); } +static void +free_load_arg(void *ptr) +{ + clear_load_arg(ptr); + xfree(ptr); +} + static VALUE r_object _((struct load_arg *arg)); static int @@ -1415,23 +1419,14 @@ return r_object0(arg, arg->proc, 0, Qnil); } -static VALUE -load(arg) +static void +clear_load_arg(arg) struct load_arg *arg; { - return r_object(arg); -} - -static VALUE -load_ensure(arg) - struct load_arg *arg; -{ - if (!DATA_PTR(arg->wrapper)) return 0; + if (!arg->symbols) return; st_free_table(arg->symbols); + arg->symbols = 0; st_free_table(arg->data); - DATA_PTR(arg->wrapper) = 0; - arg->wrapper = 0; - return 0; } /* @@ -1451,35 +1446,37 @@ VALUE *argv; { VALUE port, proc; - int major, minor; - VALUE v; - struct load_arg arg; + int major, minor, taint = Qfalse; + VALUE v, wrapper; + struct load_arg *arg; rb_scan_args(argc, argv, "11", &port, &proc); v = rb_check_string_type(port); if (!NIL_P(v)) { - arg.taint = OBJ_TAINTED(port); /* original taintedness */ + taint = OBJ_TAINTED(port); /* original taintedness */ port = v; } else if (rb_respond_to(port, s_getc) && rb_respond_to(port, s_read)) { if (rb_respond_to(port, s_binmode)) { rb_funcall2(port, s_binmode, 0, 0); } - arg.taint = Qtrue; + taint = Qtrue; } else { rb_raise(rb_eTypeError, "instance of IO needed"); } - arg.src = port; - arg.offset = 0; - arg.symbols = st_init_numtable(); - arg.data = st_init_numtable(); - arg.proc = 0; - arg.wrapper = Data_Wrap_Struct(rb_cData, mark_load_arg, 0, &arg); + wrapper = Data_Make_Struct(rb_cData, struct load_arg, mark_load_arg, free_load_arg, arg); + arg->src = port; + arg->offset = 0; + arg->symbols = st_init_numtable(); + arg->data = st_init_numtable(); + arg->proc = 0; + arg->taint = taint; - major = r_byte(&arg); - minor = r_byte(&arg); + major = r_byte(arg); + minor = r_byte(arg); if (major != MARSHAL_MAJOR || minor > MARSHAL_MINOR) { + clear_load_arg(arg); rb_raise(rb_eTypeError, "incompatible marshal file format (can't be read)\n\ \tformat version %d.%d required; %d.%d given", MARSHAL_MAJOR, MARSHAL_MINOR, major, minor); @@ -1490,8 +1487,10 @@ MARSHAL_MAJOR, MARSHAL_MINOR, major, minor); } - if (!NIL_P(proc)) arg.proc = proc; - v = rb_ensure(load, (VALUE)&arg, load_ensure, (VALUE)&arg); + if (!NIL_P(proc)) arg->proc = proc; + v = r_object(arg); + clear_load_arg(arg); + RB_GC_GUARD(wrapper); return v; } Index: ruby_1_8_7/test/ruby/test_marshal.rb =================================================================== --- ruby_1_8_7/test/ruby/test_marshal.rb (revision 26075) +++ ruby_1_8_7/test/ruby/test_marshal.rb (revision 26076) @@ -71,4 +71,41 @@ } assert_equal("marshal data too short", e.message) end + + class DumpTest + def marshal_dump + loop { Thread.pass } + end + end + + class LoadTest + def marshal_dump + nil + end + def marshal_load(obj) + loop { Thread.pass } + end + end + + def test_context_switch + o = DumpTest.new + Thread.new { Marshal.dump(o) } + GC.start + assert(true, '[ruby-dev:39425]') + + o = LoadTest.new + m = Marshal.dump(o) + Thread.new { Marshal.load(m) } + GC.start + assert(true, '[ruby-dev:39425]') + end + + def test_taint + x = Object.new + x.taint + s = Marshal.dump(x) + assert_equal(true, s.tainted?) + y = Marshal.load(s) + assert_equal(true, y.tainted?) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/