diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | marshal.c | 27 | ||||
| -rw-r--r-- | object.c | 2 |
3 files changed, 22 insertions, 14 deletions
@@ -1,3 +1,10 @@ +Wed May 28 12:52:41 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search + private methods too. [ruby-dev:34671] + + * object.c (convert_type): ditto. + Wed May 28 08:42:51 2008 Tanaka Akira <akr@fsij.org> * numeric.c: "%" is required before PRI?VALUE. @@ -582,7 +582,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) else { if (OBJ_TAINTED(obj)) arg->taint = Qtrue; - if (rb_respond_to(obj, s_mdump)) { + if (rb_obj_respond_to(obj, s_mdump, Qtrue)) { volatile VALUE v; st_add_direct(arg->data, obj, arg->data->num_entries); @@ -594,7 +594,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit) if (hasiv) w_ivar(obj, 0, &c_arg); return; } - if (rb_respond_to(obj, s_dump)) { + if (rb_obj_respond_to(obj, s_dump, Qtrue)) { VALUE v; st_table *ivtbl2 = 0; int hasiv2; @@ -758,7 +758,7 @@ w_object(VALUE obj, struct dump_arg *arg, int 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)); @@ -855,13 +855,13 @@ marshal_dump(int argc, VALUE *argv) } arg.dest = 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.str = rb_str_buf_new(0); 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); } } @@ -1419,7 +1419,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE 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)); } @@ -1447,7 +1447,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE 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)); } @@ -1474,7 +1474,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE 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'"); @@ -1490,7 +1490,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) rb_raise(rb_eArgError, "dump format error"); } v = 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)); @@ -1590,12 +1590,13 @@ marshal_load(int argc, VALUE *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_getbyte) && rb_respond_to(port, s_read)) { - if (rb_respond_to(port, s_binmode)) { + else if (rb_obj_respond_to(port, s_getbyte, 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; @@ -1892,7 +1892,7 @@ convert_type(VALUE val, const char *tname, const char *method, int raise) ID m; m = rb_intern(method); - if (!rb_respond_to(val, m)) { + if (!rb_obj_respond_to(val, m, Qtrue)) { if (raise) { rb_raise(rb_eTypeError, "can't convert %s into %s", NIL_P(val) ? "nil" : |