diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 14:37:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-18 14:37:42 +0000 |
commit | f2549e0bf7e73a85f2ddd24c813331110a47fd9d (patch) | |
tree | a0c64f3f308121c09b247f86467a25ecf2282e9b | |
parent | 79e68a49d9831a3ab224ad4ebb881772e6636191 (diff) |
* 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
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | marshal.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Oct 18 23:37:05 2004 Nobuyoshi Nakada <[email protected]> + + * marshal.c (r_object0): check inheritance by the internal function. + [ruby-dev:24515] + Mon Oct 18 11:29:32 2004 Nobuyoshi Nakada <[email protected]> * io.c (rb_io_flags_mode, rb_io_mode_flags): distinguish whether 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; |