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

marshal.c: reentrant checks

Browse Source 
* marshal.c (dump_funcall, dump_check_funcall, load_funcall):
  function calls with reentrant check.  always show names
  corresponding to the called methods.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-09-25 12:45:10 +00:00
parent 2c1aa2caab
commit 1b9410083e
1 changed files with 24 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
marshal.c
View File

@ -165,15 +165,19 @@ struct dump_call_arg {
int limit; int limit;
}; };
static void static VALUE
check_dump_arg(struct dump_arg *arg, const char *name) check_dump_arg(VALUE ret, struct dump_arg *arg, const char *name)
{ {
if (!arg->symbols) { if (!arg->symbols) {
rb_raise(rb_eRuntimeError, "Marshal.dump reentered at %s", rb_raise(rb_eRuntimeError, "Marshal.dump reentered at %s",
name); name);
} }
return ret;
} }
#define check_dump_arg(arg, sym) check_dump_arg(arg, name_##sym) #define dump_funcall(arg, obj, sym, argc, argv) \
check_dump_arg(rb_funcallv(obj, sym, argc, argv), arg, name_##sym)
#define dump_check_funcall(arg, obj, sym, argc, argv) \
check_dump_arg(rb_check_funcall(obj, sym, argc, argv), arg, name_##sym)
static void clear_dump_arg(struct dump_arg *arg); static void clear_dump_arg(struct dump_arg *arg);
@ -712,8 +716,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
if (rb_obj_respond_to(obj, s_mdump, TRUE)) { if (rb_obj_respond_to(obj, s_mdump, TRUE)) {
st_add_direct(arg->data, obj, arg->data->num_entries); st_add_direct(arg->data, obj, arg->data->num_entries);
v = rb_funcall2(obj, s_mdump, 0, 0); v = dump_funcall(arg, obj, s_mdump, 0, 0);
check_dump_arg(arg, s_mdump);
w_class(TYPE_USRMARSHAL, obj, arg, FALSE); w_class(TYPE_USRMARSHAL, obj, arg, FALSE);
w_object(v, arg, limit); w_object(v, arg, limit);
return; return;
@ -724,8 +727,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
VALUE encname2; VALUE encname2;
v = INT2NUM(limit); v = INT2NUM(limit);
v = rb_funcall2(obj, s_dump, 1, &v); v = dump_funcall(arg, obj, s_dump, 1, &v);
check_dump_arg(arg, s_dump);
if (!RB_TYPE_P(v, T_STRING)) { if (!RB_TYPE_P(v, T_STRING)) {
rb_raise(rb_eTypeError, "_dump() must return string"); rb_raise(rb_eTypeError, "_dump() must return string");
} }
@ -907,8 +909,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
"no _dump_data is defined for class %"PRIsVALUE, "no _dump_data is defined for class %"PRIsVALUE,
rb_obj_class(obj)); rb_obj_class(obj));
} }
v = rb_funcall2(obj, s_dump_data, 0, 0); v = dump_funcall(arg, obj, s_dump_data, 0, 0);
check_dump_arg(arg, s_dump_data);
w_class(TYPE_DATA, obj, arg, TRUE); w_class(TYPE_DATA, obj, arg, TRUE);
w_object(v, arg, limit); w_object(v, arg, limit);
} }
@ -1018,9 +1019,7 @@ marshal_dump(int argc, VALUE *argv)
io_needed(); io_needed();
} }
arg->dest = port; arg->dest = port;
if (rb_check_funcall(port, s_binmode, 0, 0) != Qundef) { dump_check_funcall(arg, port, s_binmode, 0, 0);
check_dump_arg(arg, s_binmode);
}
} }
else { else {
port = arg->str; port = arg->str;
@ -1053,15 +1052,17 @@ struct load_arg {
int infection; int infection;
}; };
static void static VALUE
check_load_arg(struct load_arg *arg, const char *name) check_load_arg(VALUE ret, struct load_arg *arg, const char *name)
{ {
if (!arg->symbols) { if (!arg->symbols) {
rb_raise(rb_eRuntimeError, "Marshal.load reentered at %s", rb_raise(rb_eRuntimeError, "Marshal.load reentered at %s",
name); name);
} }
return ret;
} }
#define check_load_arg(arg, sym) check_load_arg(arg, name_##sym) #define load_funcall(arg, obj, sym, argc, argv) \
check_load_arg(rb_funcallv(obj, sym, argc, argv), arg, name_##sym)
static void clear_load_arg(struct load_arg *arg); static void clear_load_arg(struct load_arg *arg);
@ -1124,9 +1125,7 @@ r_byte1_buffered(struct load_arg *arg)
long readable = arg->readable < BUFSIZ ? arg->readable : BUFSIZ; long readable = arg->readable < BUFSIZ ? arg->readable : BUFSIZ;
VALUE str, n = LONG2NUM(readable); VALUE str, n = LONG2NUM(readable);
str = rb_funcall2(arg->src, s_read, 1, &n); str = load_funcall(arg, arg->src, s_read, 1, &n);
check_load_arg(arg, s_read);
if (NIL_P(str)) too_short(); if (NIL_P(str)) too_short();
StringValue(str); StringValue(str);
arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION); arg->infection |= (int)FL_TEST(str, MARSHAL_INFECTION);
@ -1156,8 +1155,7 @@ r_byte(struct load_arg *arg)
c = r_byte1_buffered(arg); c = r_byte1_buffered(arg);
} }
else { else {
VALUE v = rb_funcall2(arg->src, s_getbyte, 0, 0); VALUE v = load_funcall(arg, arg->src, s_getbyte, 0, 0);
check_load_arg(arg, s_getbyte);
if (NIL_P(v)) rb_eof_error(); if (NIL_P(v)) rb_eof_error();
c = (unsigned char)NUM2CHR(v); c = (unsigned char)NUM2CHR(v);
} }
@ -1218,8 +1216,7 @@ r_bytes1(long len, struct load_arg *arg)
{ {
VALUE str, n = LONG2NUM(len); VALUE str, n = LONG2NUM(len);
str = rb_funcall2(arg->src, s_read, 1, &n); str = load_funcall(arg, arg->src, s_read, 1, &n);
check_load_arg(arg, s_read);
if (NIL_P(str)) too_short(); if (NIL_P(str)) too_short();
StringValue(str); StringValue(str);
if (RSTRING_LEN(str) != len) too_short(); if (RSTRING_LEN(str) != len) too_short();
@ -1247,9 +1244,7 @@ r_bytes1_buffered(long len, struct load_arg *arg)
readable = readable < BUFSIZ ? readable : BUFSIZ; readable = readable < BUFSIZ ? readable : BUFSIZ;
read_len = need_len > readable ? need_len : readable; read_len = need_len > readable ? need_len : readable;
n = LONG2NUM(read_len); n = LONG2NUM(read_len);
tmp = rb_funcall2(arg->src, s_read, 1, &n); tmp = load_funcall(arg, arg->src, s_read, 1, &n);
check_load_arg(arg, s_read);
if (NIL_P(tmp)) too_short(); if (NIL_P(tmp)) too_short();
StringValue(tmp); StringValue(tmp);
@ -1434,8 +1429,7 @@ static VALUE
r_post_proc(VALUE v, struct load_arg *arg) r_post_proc(VALUE v, struct load_arg *arg)
{ {
if (arg->proc) { if (arg->proc) {
v = rb_funcall(arg->proc, s_call, 1, v); v = load_funcall(arg, arg->proc, s_call, 1, &v);
check_load_arg(arg, s_call);
} }
return v; return v;
} }
@ -1839,8 +1833,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
r_ivar(data, NULL, arg); r_ivar(data, NULL, arg);
*ivp = FALSE; *ivp = FALSE;
} }
v = rb_funcall2(klass, s_load, 1, &data); v = load_funcall(arg, klass, s_load, 1, &data);
check_load_arg(arg, s_load);
v = r_entry(v, arg); v = r_entry(v, arg);
v = r_leave(v, arg); v = r_leave(v, arg);
} }
@ -1864,8 +1857,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
} }
v = r_entry(v, arg); v = r_entry(v, arg);
data = r_object(arg); data = r_object(arg);
rb_funcall2(v, s_mload, 1, &data); load_funcall(arg, v, s_mload, 1, &data);
check_load_arg(arg, s_mload);
v = r_fixup_compat(v, arg); v = r_fixup_compat(v, arg);
v = r_copy_ivar(v, data); v = r_copy_ivar(v, data);
v = r_post_proc(v, arg); v = r_post_proc(v, arg);
@ -1907,8 +1899,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
name); name);
} }
r = r_object0(arg, 0, extmod); r = r_object0(arg, 0, extmod);
rb_funcall2(v, s_load_data, 1, &r); load_funcall(arg, v, s_load_data, 1, &r);
check_load_arg(arg, s_load_data);
v = r_leave(v, arg); v = r_leave(v, arg);
} }
break; break;