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 | 65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b (patch) | |
| tree | b8966b0da606dc47af57ba410a430d316972c9b0 | |
| parent | 6f9e5cd7d8956737b2aa6c51d90ead7e93ea8999 (diff) | |
| download | ruby-65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b.tar.gz ruby-65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b.tar.xz ruby-65d7e55d11da368ec8c7ab600dcd6df53b1b5e3b.zip | |
* 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
| -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 <nobu@ruby-lang.org> + + * marshal.c (r_object0): check inheritance by the internal function. + [ruby-dev:24515] + Mon Oct 18 15:58:01 2004 NAKAMURA Usaku <usa@ruby-lang.org> * range.c (range_step, range_each): need cast. @@ -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; |