diff options
Diffstat (limited to 'marshal.c')
-rw-r--r-- | marshal.c | 27 |
1 files changed, 14 insertions, 13 deletions
@@ -511,7 +511,7 @@ w_object(obj, arg, limit) if (OBJ_TAINTED(obj)) arg->taint = Qtrue; st_add_direct(arg->data, obj, arg->data->num_entries); - if (rb_respond_to(obj, s_mdump)) { + if (rb_obj_respond_to(obj, s_mdump, Qtrue)) { volatile VALUE v; v = rb_funcall(obj, s_mdump, 0, 0); @@ -521,7 +521,7 @@ w_object(obj, arg, limit) if (ivtbl) w_ivar(0, &c_arg); return; } - if (rb_respond_to(obj, s_dump)) { + if (rb_obj_respond_to(obj, s_dump, Qtrue)) { VALUE v; v = rb_funcall(obj, s_dump, 1, INT2NUM(limit)); @@ -664,7 +664,7 @@ w_object(obj, arg, limit) { VALUE v; - if (!rb_respond_to(obj, s_dump_data)) { + if (!rb_obj_respond_to(obj, s_dump_data, Qtrue)) { rb_raise(rb_eTypeError, "no marshal_dump is defined for class %s", rb_obj_classname(obj)); @@ -765,12 +765,12 @@ marshal_dump(argc, argv) arg.str = rb_str_buf_new(0); RBASIC(arg.str)->klass = 0; if (!NIL_P(port)) { - if (!rb_respond_to(port, s_write)) { + if (!rb_obj_respond_to(port, s_write, Qtrue)) { type_error: rb_raise(rb_eTypeError, "instance of IO needed"); } arg.dest = port; - if (rb_respond_to(port, s_binmode)) { + if (rb_obj_respond_to(port, s_binmode, Qtrue)) { rb_funcall2(port, s_binmode, 0, 0); reentrant_check(arg.str, s_dump_data); } @@ -1248,7 +1248,7 @@ r_object0(arg, proc, ivp, extmod) VALUE klass = path2class(r_unique(arg)); VALUE data; - if (!rb_respond_to(klass, s_load)) { + if (!rb_obj_respond_to(klass, s_load, Qtrue)) { rb_raise(rb_eTypeError, "class %s needs to have method `_load'", rb_class2name(klass)); } @@ -1275,7 +1275,7 @@ r_object0(arg, proc, ivp, extmod) rb_extend_object(v, m); } } - if (!rb_respond_to(v, s_mload)) { + if (!rb_obj_respond_to(v, s_mload, Qtrue)) { rb_raise(rb_eTypeError, "instance of %s needs to have method `marshal_load'", rb_class2name(klass)); } @@ -1302,7 +1302,7 @@ r_object0(arg, proc, ivp, extmod) case TYPE_DATA: { VALUE klass = path2class(r_unique(arg)); - if (rb_respond_to(klass, s_alloc)) { + if (rb_obj_respond_to(klass, s_alloc, Qtrue)) { static int warn = Qtrue; if (warn) { rb_warn("define `allocate' instead of `_alloc'"); @@ -1318,7 +1318,7 @@ r_object0(arg, proc, ivp, extmod) rb_raise(rb_eArgError, "dump format error"); } r_entry(v, arg); - if (!rb_respond_to(v, s_load_data)) { + if (!rb_obj_respond_to(v, s_load_data, Qtrue)) { rb_raise(rb_eTypeError, "class %s needs to have instance method `_load_data'", rb_class2name(klass)); @@ -1418,12 +1418,13 @@ marshal_load(argc, argv) struct load_arg arg; rb_scan_args(argc, argv, "11", &port, &proc); - if (rb_respond_to(port, rb_intern("to_str"))) { + v = rb_check_string_type(port); + if (!NIL_P(v)) { arg.taint = OBJ_TAINTED(port); /* original taintedness */ - StringValue(port); /* possible conversion */ + port = v; } - else if (rb_respond_to(port, s_getc) && rb_respond_to(port, s_read)) { - if (rb_respond_to(port, s_binmode)) { + else if (rb_obj_respond_to(port, s_getc, Qtrue) && rb_obj_respond_to(port, s_read, Qtrue)) { + if (rb_obj_respond_to(port, s_binmode, Qtrue)) { rb_funcall2(port, s_binmode, 0, 0); } arg.taint = Qtrue; |