Skip to content

Commit

Permalink
* marshal.c (struct {dump,load}_arg): manage with dfree, instead
Browse files Browse the repository at this point in the history 
  of using local variable which may be moved by context switch.
  [ruby-dev:39425]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
@nobu
nobu committed Oct 4, 2009
1 parent f517fb5 commit f6f89b8
Show file tree
Hide file tree
Showing 3 changed files with 147 additions and 76 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
Sun Oct 4 19:30:54 2009 Nobuyoshi Nakada <[email protected]>

* marshal.c (struct {dump,load}_arg): manage with dfree, instead
of using local variable which may be moved by context switch.
[ruby-dev:39425]

Sun Oct 4 15:00:32 2009 Nobuyoshi Nakada <[email protected]>

* pack.c (NATINT_LEN, pack_pack): suppressed warnings.
Expand Down
176 changes: 100 additions & 76 deletions marshal.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,12 @@ rb_marshal_define_compat(VALUE newclass, VALUE oldclass, VALUE (*dumper)(VALUE),
}

struct dump_arg {
VALUE obj;
VALUE str, dest;
st_table *symbols;
st_table *data;
int taint;
int untrust;
st_table *compat_tbl;
VALUE wrapper;
st_table *encodings;
};

Expand All @@ -152,12 +150,14 @@ struct dump_call_arg {
static void
check_dump_arg(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(void *ptr)
{
Expand All @@ -168,6 +168,24 @@ mark_dump_arg(void *ptr)
rb_mark_hash(p->compat_tbl);
}

static void
free_dump_arg(void *ptr)
{
clear_dump_arg(ptr);
xfree(ptr);
}

static size_t
memsize_dump_arg(const void *ptr)
{
return ptr ? sizeof(struct dump_arg) : 0;
}

static const rb_data_type_t dump_arg_data = {
"dump_arg",
mark_dump_arg, free_dump_arg, memsize_dump_arg
};

static const char *
must_not_be_anonymous(const char *type, VALUE path)
{
Expand Down Expand Up @@ -825,34 +843,24 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
}
}

static VALUE
dump(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(struct dump_arg *arg)
static void
clear_dump_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);
st_free_table(arg->compat_tbl);
if (arg->encodings) st_free_table(arg->encodings);
DATA_PTR(arg->wrapper) = 0;
arg->wrapper = 0;
if (arg->encodings) {
st_free_table(arg->encodings);
arg->encodings = 0;
}
if (arg->taint) {
OBJ_TAINT(arg->str);
}
if (arg->untrust) {
OBJ_UNTRUST(arg->str);
}
return 0;
}

/*
Expand Down Expand Up @@ -886,8 +894,8 @@ marshal_dump(int argc, VALUE *argv)
{
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);
Expand All @@ -901,40 +909,41 @@ marshal_dump(int argc, VALUE *argv)
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 = FALSE;
arg.untrust = FALSE;
arg.compat_tbl = st_init_numtable();
arg.encodings = 0;
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 = TypedData_Make_Struct(rb_cData, struct dump_arg, &dump_arg_data, arg);
arg->dest = 0;
arg->symbols = st_init_numtable();
arg->data = st_init_numtable();
arg->taint = FALSE;
arg->untrust = FALSE;
arg->compat_tbl = st_init_numtable();
arg->encodings = 0;
arg->str = rb_str_tmp_new(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);

rb_ensure(dump, (VALUE)&c_arg, dump_ensure, (VALUE)&arg);
RBASIC(arg.str)->klass = rb_cString;
w_object(obj, arg, limit);
if (arg->dest) {
rb_io_write(arg->dest, arg->str);
rb_str_resize(arg->str, 0);
}
RBASIC(arg->str)->klass = rb_cString;
clear_dump_arg(arg);
RB_GC_GUARD(wrapper);

return port;
}
Expand All @@ -948,18 +957,19 @@ struct load_arg {
int taint;
int untrust;
st_table *compat_tbl;
VALUE wrapper;
};

static void
check_load_arg(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(void *ptr)
{
Expand All @@ -970,6 +980,24 @@ mark_load_arg(void *ptr)
rb_mark_hash(p->compat_tbl);
}

static void
free_load_arg(void *ptr)
{
clear_load_arg(ptr);
xfree(ptr);
}

static size_t
memsize_load_arg(const void *ptr)
{
return ptr ? sizeof(struct load_arg) : 0;
}

static const rb_data_type_t load_arg_data = {
"load_arg",
mark_load_arg, free_load_arg, memsize_load_arg
};

static VALUE r_entry(VALUE v, struct load_arg *arg);
static VALUE r_object(struct load_arg *arg);
static ID r_symbol(struct load_arg *arg);
Expand Down Expand Up @@ -1679,22 +1707,14 @@ r_object(struct load_arg *arg)
return r_object0(arg, 0, Qnil);
}

static VALUE
load(struct load_arg *arg)
{
return r_object(arg);
}

static VALUE
load_ensure(struct load_arg *arg)
static void
clear_load_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);
st_free_table(arg->compat_tbl);
DATA_PTR(arg->wrapper) = 0;
arg->wrapper = 0;
return 0;
}

/*
Expand All @@ -1712,37 +1732,39 @@ static VALUE
marshal_load(int argc, VALUE *argv)
{
VALUE port, proc;
int major, minor;
VALUE v;
struct load_arg arg;
int major, minor, taint = FALSE;
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_getbyte) && rb_respond_to(port, s_read)) {
if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0);
}
arg.taint = TRUE;
taint = TRUE;
}
else {
rb_raise(rb_eTypeError, "instance of IO needed");
}
arg.untrust = OBJ_UNTRUSTED(port);
arg.src = port;
arg.offset = 0;
arg.symbols = st_init_numtable();
arg.data = st_init_numtable();
arg.compat_tbl = st_init_numtable();
arg.proc = 0;
arg.wrapper = Data_Wrap_Struct(rb_cData, mark_load_arg, 0, &arg);

major = r_byte(&arg);
minor = r_byte(&arg);
wrapper = TypedData_Make_Struct(rb_cData, struct load_arg, &load_arg_data, arg);
arg->taint = taint;
arg->untrust = OBJ_UNTRUSTED(port);
arg->src = port;
arg->offset = 0;
arg->symbols = st_init_numtable();
arg->data = st_init_numtable();
arg->compat_tbl = st_init_numtable();
arg->proc = 0;

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);
Expand All @@ -1753,8 +1775,10 @@ marshal_load(int argc, VALUE *argv)
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;
}
Expand Down
41 changes: 41 additions & 0 deletions test/ruby/test_marshal.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,45 @@ def test_regexp
c = [/#{a}/, /#{b}/]
assert_equal(c, Marshal.load(Marshal.dump(c)))
end

class DumpTest
def marshal_dump
@@block.call(:marshal_dump)
end

def dump_each(&block)
@@block = block
Marshal.dump(self)
end
end

class LoadTest
def marshal_dump
nil
end
def marshal_load(obj)
@@block.call(:marshal_load)
end
def self.load_each(m, &block)
@@block = block
Marshal.load(m)
end
end

def test_context_switch
o = DumpTest.new
e = o.enum_for(:dump_each)
assert_equal(:marshal_dump, e.next)
GC.start
assert(true, '[ruby-dev:39425]')
assert_raise(StopIteration) {e.next}

o = LoadTest.new
m = Marshal.dump(o)
e = LoadTest.enum_for(:load_each, m)
assert_equal(:marshal_load, e.next)
GC.start
assert(true, '[ruby-dev:39425]')
assert_raise(StopIteration) {e.next}
end
end

0 comments on commit f6f89b8

Please sign in to comment.