* marshal.c (r_object0): check inheritance by the internal function.

[ruby-dev:24515]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2004-10-18 14:37:42 +00:00
parent 79e68a49d9
commit f2549e0bf7
2 changed files with 6 additions and 1 deletions

View File

@ -1,3 +1,8 @@
Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (r_object0): check inheritance by the internal function.
[ruby-dev:24515]
Mon Oct 18 11:29:32 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether file

View File

@ -1050,7 +1050,7 @@ r_object0(arg, proc, ivp, extmod)
format_error:
rb_raise(rb_eArgError, "dump format error (user class)");
}
if (TYPE(v) == T_MODULE || !RTEST(rb_funcall(c, '<', 1, RBASIC(v)->klass))) {
if (TYPE(v) == T_MODULE || !RTEST(rb_class_inherited_p(c, RBASIC(v)->klass))) {
VALUE tmp = rb_obj_alloc(c);
if (TYPE(v) != TYPE(tmp)) goto format_error;