From 65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 18 Oct 2004 14:37:42 +0000 Subject: * marshal.c (r_object0): check inheritance by the internal function. [ruby-dev:24515] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7063 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ marshal.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 797d41314..c97883b83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada + + * marshal.c (r_object0): check inheritance by the internal function. + [ruby-dev:24515] + Mon Oct 18 15:58:01 2004 NAKAMURA Usaku * range.c (range_step, range_each): need cast. diff --git a/marshal.c b/marshal.c index 71c6d1669..5323fdde2 100644 --- a/marshal.c +++ b/marshal.c @@ -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; -- cgit