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 (w_object, marshal_dump, r_object0, marshal_load): search

Browse source 
public methods only.  [ruby-core:17283]

* object.c (convert_type): ditto.

* lib/singleton.rb (Singleton#_dump): conversion method should be
  public.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-06-18 03:05:33 +00:00
parent 3c48ebce0b
commit 02337b089e
4 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Wed Jun 18 12:05:30 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (w_object, marshal_dump, r_object0, marshal_load): search
public methods only. [ruby-core:17283]
* object.c (convert_type): ditto.
* lib/singleton.rb (Singleton#_dump): conversion method should be
public.
Wed Jun 18 10:18:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Jun 18 10:18:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc. a patch from * ext/etc/etc.c (etc_passwd, etc_group): fixed rdoc. a patch from

2
lib/singleton.rb
View file

@ -71,8 +71,6 @@ module Singleton
raise TypeError, "can't dup instance of singleton #{self.class}" raise TypeError, "can't dup instance of singleton #{self.class}"
end end
private
# default marshalling strategy # default marshalling strategy
def _dump(depth = -1) def _dump(depth = -1)
'' ''

22
marshal.c
View file

@ -582,7 +582,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
else { else {
if (OBJ_TAINTED(obj)) arg->taint = Qtrue; if (OBJ_TAINTED(obj)) arg->taint = Qtrue;
if (rb_obj_respond_to(obj, s_mdump, Qtrue)) { if (rb_respond_to(obj, s_mdump)) {
volatile VALUE v; volatile VALUE v;
st_add_direct(arg->data, obj, arg->data->num_entries); 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); if (hasiv) w_ivar(obj, 0, &c_arg);
return; return;
} }
if (rb_obj_respond_to(obj, s_dump, Qtrue)) { if (rb_respond_to(obj, s_dump)) {
VALUE v; VALUE v;
st_table *ivtbl2 = 0; st_table *ivtbl2 = 0;
int hasiv2; int hasiv2;
@ -759,7 +759,7 @@ w_object(VALUE obj, struct dump_arg *arg, int limit)
{ {
VALUE v; VALUE v;
if (!rb_obj_respond_to(obj, s_dump_data, Qtrue)) { if (!rb_respond_to(obj, s_dump_data)) {
rb_raise(rb_eTypeError, rb_raise(rb_eTypeError,
"no marshal_dump is defined for class %s", "no marshal_dump is defined for class %s",
rb_obj_classname(obj)); rb_obj_classname(obj));
@ -856,13 +856,13 @@ marshal_dump(int argc, VALUE *argv)
} }
arg.dest = 0; arg.dest = 0;
if (!NIL_P(port)) { if (!NIL_P(port)) {
if (!rb_obj_respond_to(port, s_write, Qtrue)) { if (!rb_respond_to(port, s_write)) {
type_error: type_error:
rb_raise(rb_eTypeError, "instance of IO needed"); rb_raise(rb_eTypeError, "instance of IO needed");
} }
arg.str = rb_str_buf_new(0); arg.str = rb_str_buf_new(0);
arg.dest = port; arg.dest = port;
if (rb_obj_respond_to(port, s_binmode, Qtrue)) { if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0); rb_funcall2(port, s_binmode, 0, 0);
} }
} }
@ -1420,7 +1420,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
VALUE klass = path2class(r_unique(arg)); VALUE klass = path2class(r_unique(arg));
VALUE data; VALUE data;
if (!rb_obj_respond_to(klass, s_load, Qtrue)) { if (!rb_respond_to(klass, s_load)) {
rb_raise(rb_eTypeError, "class %s needs to have method `_load'", rb_raise(rb_eTypeError, "class %s needs to have method `_load'",
rb_class2name(klass)); rb_class2name(klass));
} }
@ -1448,7 +1448,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_extend_object(v, m); rb_extend_object(v, m);
} }
} }
if (!rb_obj_respond_to(v, s_mload, Qtrue)) { if (!rb_respond_to(v, s_mload)) {
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));
} }
@ -1475,7 +1475,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
case TYPE_DATA: case TYPE_DATA:
{ {
VALUE klass = path2class(r_unique(arg)); VALUE klass = path2class(r_unique(arg));
if (rb_obj_respond_to(klass, s_alloc, Qtrue)) { if (rb_respond_to(klass, s_alloc)) {
static int warn = Qtrue; static int warn = Qtrue;
if (warn) { if (warn) {
rb_warn("define `allocate' instead of `_alloc'"); rb_warn("define `allocate' instead of `_alloc'");
@ -1491,7 +1491,7 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod)
rb_raise(rb_eArgError, "dump format error"); rb_raise(rb_eArgError, "dump format error");
} }
v = r_entry(v, arg); v = r_entry(v, arg);
if (!rb_obj_respond_to(v, s_load_data, Qtrue)) { 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));
@ -1596,8 +1596,8 @@ marshal_load(int argc, VALUE *argv)
arg.taint = OBJ_TAINTED(port); /* original taintedness */ arg.taint = OBJ_TAINTED(port); /* original taintedness */
port = v; port = v;
} }
else if (rb_obj_respond_to(port, s_getbyte, Qtrue) && rb_obj_respond_to(port, s_read, Qtrue)) { else if (rb_respond_to(port, s_getbyte) && rb_respond_to(port, s_read)) {
if (rb_obj_respond_to(port, s_binmode, Qtrue)) { if (rb_respond_to(port, s_binmode)) {
rb_funcall2(port, s_binmode, 0, 0); rb_funcall2(port, s_binmode, 0, 0);
} }
arg.taint = Qtrue; arg.taint = Qtrue;

2
object.c
View file

@ -1904,7 +1904,7 @@ convert_type(VALUE val, const char *tname, const char *method, int raise)
ID m; ID m;
m = rb_intern(method); m = rb_intern(method);
if (!rb_obj_respond_to(val, m, Qtrue)) { if (!rb_respond_to(val, m)) {
if (raise) { if (raise) {
rb_raise(rb_eTypeError, "can't convert %s into %s", rb_raise(rb_eTypeError, "can't convert %s into %s",
NIL_P(val) ? "nil" : NIL_P(val) ? "nil" :