diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | marshal.c | 3 | ||||
| -rw-r--r-- | struct.c | 5 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,10 @@ +Sat Sep 8 10:22:20 2007 Yukihiro Matsumoto <matz@ruby-lang.org> + + * struct.c (rb_struct_s_members): should raise TypeError instead + of call rb_bug(). [ruby-dev:31709] + + * marshal.c (r_object0): no nil check require any more. + Sat Sep 8 09:38:19 2007 Tadayoshi Funaba <tadf@dotrb.org> * lib/date/format.rb (str[fp]time): now check specifications more @@ -1199,9 +1199,6 @@ r_object0(arg, proc, ivp, extmod) klass = path2class(r_unique(arg)); mem = rb_struct_s_members(klass); - if (mem == Qnil) { - rb_raise(rb_eTypeError, "uninitialized struct"); - } len = r_long(arg); values = rb_ary_new2(len); @@ -41,7 +41,10 @@ rb_struct_s_members(klass) VALUE members = rb_struct_iv_get(klass, "__members__"); if (NIL_P(members)) { - rb_bug("non-initialized struct"); + rb_raise(rb_eTypeError, "uninitialized struct"); + } + if (TYPE(members) != T_ARRAY) { + rb_raise(rb_eTypeError, "corrupted struct"); } return members; } @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2007-09-05" +#define RUBY_RELEASE_DATE "2007-09-08" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20070905 +#define RUBY_RELEASE_CODE 20070908 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 9 -#define RUBY_RELEASE_DAY 5 +#define RUBY_RELEASE_DAY 8 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |