diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | marshal.c | 10 |
2 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Mon Sep 10 01:21:23 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * marshal.c (r_object0): struct allocation first to check if a + class is a struct. compatibility check should come next. + Mon Sep 10 01:05:25 2007 Yukihiro Matsumoto <matz@ruby-lang.org> * range.c (range_step): fixed integer overflow. [ruby-dev:31763] @@ -1254,18 +1254,18 @@ r_object0(struct load_arg *arg, int *ivp, VALUE extmod) ID slot; klass = path2class(r_unique(arg)); - mem = rb_struct_s_members(klass); len = r_long(arg); + v = rb_obj_alloc(klass); + if (TYPE(v) != T_STRUCT) { + rb_raise(rb_eTypeError, "class %s not a struct", rb_class2name(klass)); + } + mem = rb_struct_s_members(klass); if (RARRAY_LEN(mem) != len) { rb_raise(rb_eTypeError, "struct %s not compatible (struct size differs)", rb_class2name(klass)); } - v = rb_obj_alloc(klass); - if (TYPE(v) != T_STRUCT) { - rb_raise(rb_eArgError, "dump format error"); - } v = r_entry(v, arg); values = rb_ary_new2(len); for (i=0; i<len; i++) { |