diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | marshal.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Mar 20 22:54:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * marshal.c (w_extended): erroneous check condition when dump + method is defined. [ruby-core:10646] + Tue Mar 20 15:37:24 2007 URABE Shyouhei <shyouhei@ruby-lang.org> * distruby.rb: Add zip generation. @@ -373,8 +373,8 @@ w_extended(klass, arg, check) { char *path; - if (FL_TEST(klass, FL_SINGLETON)) { - if (check && RCLASS(klass)->m_tbl->num_entries || + if (check && FL_TEST(klass, FL_SINGLETON)) { + if (RCLASS(klass)->m_tbl->num_entries || (RCLASS(klass)->iv_tbl && RCLASS(klass)->iv_tbl->num_entries > 1)) { rb_raise(rb_eTypeError, "singleton can't be dumped"); } @@ -652,13 +652,13 @@ w_object(obj, arg, limit) { VALUE v; - w_class(TYPE_DATA, obj, arg, Qtrue); if (!rb_respond_to(obj, s_dump_data)) { rb_raise(rb_eTypeError, "no marshal_dump is defined for class %s", rb_obj_classname(obj)); } v = rb_funcall(obj, s_dump_data, 0); + w_class(TYPE_DATA, obj, arg, Qtrue); w_object(v, arg, limit); } break; |