kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* marshal.c (r_object0): use return value from prov given as the

Browse source 
second argument to Marshal#load() to allow value replacement in
  the restoring data.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-10-22 22:24:14 +00:00
parent 7365e80645
commit a4045e27b4
2 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Oct 23 04:30:04 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* marshal.c (r_object0): use return value from prov given as the
second argument to Marshal#load() to allow value replacement in
the restoring data.
Sun Oct 22 14:48:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Sun Oct 22 14:48:31 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* signal.c (Init_signal): avoid duplicated installation of SIGCHLD * signal.c (Init_signal): avoid duplicated installation of SIGCHLD

49
marshal.c
View file

@ -890,6 +890,9 @@ r_entry(VALUE v, struct load_arg *arg)
{ {
rb_hash_aset(arg->data, INT2FIX(RHASH(arg->data)->tbl->num_entries), v); rb_hash_aset(arg->data, INT2FIX(RHASH(arg->data)->tbl->num_entries), v);
if (arg->taint) OBJ_TAINT(v); if (arg->taint) OBJ_TAINT(v);
if (arg->proc) {
v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
}
return v; return v;
} }
@ -931,7 +934,7 @@ path2module(const char *path)
} }
static VALUE static VALUE
r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod) r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
{ {
VALUE v = Qnil; VALUE v = Qnil;
int type = r_byte(arg); int type = r_byte(arg);
@ -944,13 +947,16 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
if (NIL_P(v)) { if (NIL_P(v)) {
rb_raise(rb_eArgError, "dump format error (unlinked)"); rb_raise(rb_eArgError, "dump format error (unlinked)");
} }
return v; if (arg->proc) {
v = rb_funcall(arg->proc, rb_intern("call"), 1, v);
}
break;
case TYPE_IVAR: case TYPE_IVAR:
{ {
int ivar = Qtrue; int ivar = Qtrue;
v = r_object0(arg, 0, &ivar, extmod); v = r_object0(arg, &ivar, extmod);
if (ivar) r_ivar(v, arg); if (ivar) r_ivar(v, arg);
} }
break; break;
@ -962,7 +968,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
if (NIL_P(extmod)) extmod = rb_ary_new2(0); if (NIL_P(extmod)) extmod = rb_ary_new2(0);
rb_ary_push(extmod, m); rb_ary_push(extmod, m);
v = r_object0(arg, 0, 0, extmod); v = r_object0(arg, 0, extmod);
while (RARRAY_LEN(extmod) > 0) { while (RARRAY_LEN(extmod) > 0) {
m = rb_ary_pop(extmod); m = rb_ary_pop(extmod);
rb_extend_object(v, m); rb_extend_object(v, m);
@ -977,7 +983,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
if (FL_TEST(c, FL_SINGLETON)) { if (FL_TEST(c, FL_SINGLETON)) {
rb_raise(rb_eTypeError, "singleton can't be loaded"); rb_raise(rb_eTypeError, "singleton can't be loaded");
} }
v = r_object0(arg, 0, 0, extmod); v = r_object0(arg, 0, extmod);
if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) { if (rb_special_const_p(v) || TYPE(v) == T_OBJECT || TYPE(v) == T_CLASS) {
format_error: format_error:
rb_raise(rb_eArgError, "dump format error (user class)"); rb_raise(rb_eArgError, "dump format error (user class)");
@ -1031,7 +1037,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
d = load_mantissa(d, e, RSTRING_LEN(str) - (e - ptr)); d = load_mantissa(d, e, RSTRING_LEN(str) - (e - ptr));
} }
v = rb_float_new(d); v = rb_float_new(d);
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1076,7 +1082,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
len--; len--;
} }
v = rb_big_norm((VALUE)big); v = rb_big_norm((VALUE)big);
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1097,7 +1103,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
volatile long len = r_long(arg); /* gcc 2.7.2.3 -O2 bug?? */ volatile long len = r_long(arg); /* gcc 2.7.2.3 -O2 bug?? */
v = rb_ary_new2(len); v = rb_ary_new2(len);
r_entry(v, arg); v = r_entry(v, arg);
while (len--) { while (len--) {
rb_ary_push(v, r_object(arg)); rb_ary_push(v, r_object(arg));
} }
@ -1110,7 +1116,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
long len = r_long(arg); long len = r_long(arg);
v = rb_hash_new(); v = rb_hash_new();
r_entry(v, arg); v = r_entry(v, arg);
while (len--) { while (len--) {
VALUE key = r_object(arg); VALUE key = r_object(arg);
VALUE value = r_object(arg); VALUE value = r_object(arg);
@ -1141,7 +1147,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
rb_ary_push(values, Qnil); rb_ary_push(values, Qnil);
} }
v = rb_struct_alloc(klass, values); v = rb_struct_alloc(klass, values);
r_entry(v, arg); v = r_entry(v, arg);
for (i=0; i<len; i++) { for (i=0; i<len; i++) {
slot = r_symbol(arg); slot = r_symbol(arg);
@ -1171,7 +1177,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
*ivp = Qfalse; *ivp = Qfalse;
} }
v = rb_funcall(klass, s_load, 1, data); v = rb_funcall(klass, s_load, 1, data);
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1191,7 +1197,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'", rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'",
rb_class2name(klass)); rb_class2name(klass));
} }
r_entry(v, arg); v = r_entry(v, arg);
data = r_object(arg); data = r_object(arg);
rb_funcall(v, s_mload, 1, data); rb_funcall(v, s_mload, 1, data);
} }
@ -1205,7 +1211,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
if (TYPE(v) != T_OBJECT) { if (TYPE(v) != T_OBJECT) {
rb_raise(rb_eArgError, "dump format error"); rb_raise(rb_eArgError, "dump format error");
} }
r_entry(v, arg); v = r_entry(v, arg);
r_ivar(v, arg); r_ivar(v, arg);
} }
break; break;
@ -1227,13 +1233,13 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
if (TYPE(v) != T_DATA) { if (TYPE(v) != T_DATA) {
rb_raise(rb_eArgError, "dump format error"); rb_raise(rb_eArgError, "dump format error");
} }
r_entry(v, arg); v = r_entry(v, arg);
if (!rb_respond_to(v, s_load_data)) { if (!rb_respond_to(v, s_load_data)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"class %s needs to have instance method `_load_data'", "class %s needs to have instance method `_load_data'",
rb_class2name(klass)); rb_class2name(klass));
} }
rb_funcall(v, s_load_data, 1, r_object0(arg, 0, 0, extmod)); rb_funcall(v, s_load_data, 1, r_object0(arg, 0, extmod));
} }
break; break;
@ -1242,7 +1248,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
volatile VALUE str = r_bytes(arg); volatile VALUE str = r_bytes(arg);
v = rb_path2class(RSTRING_PTR(str)); v = rb_path2class(RSTRING_PTR(str));
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1251,7 +1257,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
volatile VALUE str = r_bytes(arg); volatile VALUE str = r_bytes(arg);
v = path2class(RSTRING_PTR(str)); v = path2class(RSTRING_PTR(str));
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1260,7 +1266,7 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
volatile VALUE str = r_bytes(arg); volatile VALUE str = r_bytes(arg);
v = path2module(RSTRING_PTR(str)); v = path2module(RSTRING_PTR(str));
r_entry(v, arg); v = r_entry(v, arg);
} }
break; break;
@ -1269,22 +1275,19 @@ r_object0(struct load_arg *arg, VALUE proc, int *ivp, VALUE extmod)
break; break;
case TYPE_SYMLINK: case TYPE_SYMLINK:
return ID2SYM(r_symlink(arg)); v = ID2SYM(r_symlink(arg));
default: default:
rb_raise(rb_eArgError, "dump format error(0x%x)", type); rb_raise(rb_eArgError, "dump format error(0x%x)", type);
break; break;
} }
if (proc) {
rb_funcall(proc, rb_intern("call"), 1, v);
}
return v; return v;
} }
static VALUE static VALUE
r_object(struct load_arg *arg) r_object(struct load_arg *arg)
{ {
return r_object0(arg, arg->proc, 0, Qnil); return r_object0(arg, 0, Qnil);
} }
static VALUE static VALUE