archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* struct.c (rb_struct_s_members): should raise TypeError instead

Browse source 
of call rb_bug().  [ruby-dev:31709]

* marshal.c (r_object0): no nil check require any more.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@13411 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-09-08 01:22:58 +00:00
parent edaea1cd13
commit 64ec051588
4 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> Sat Sep 8 09:38:19 2007 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date/format.rb (str[fp]time): now check specifications more * lib/date/format.rb (str[fp]time): now check specifications more

3
marshal.c
View file

@ -1199,9 +1199,6 @@ r_object0(arg, proc, ivp, extmod)
klass = path2class(r_unique(arg)); klass = path2class(r_unique(arg));
mem = rb_struct_s_members(klass); mem = rb_struct_s_members(klass);
if (mem == Qnil) {
rb_raise(rb_eTypeError, "uninitialized struct");
}
len = r_long(arg); len = r_long(arg);
values = rb_ary_new2(len); values = rb_ary_new2(len);

5
struct.c
View file

@ -41,7 +41,10 @@ rb_struct_s_members(klass)
VALUE members = rb_struct_iv_get(klass, "__members__"); VALUE members = rb_struct_iv_get(klass, "__members__");
if (NIL_P(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; return members;
} }

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.6" #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_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20070905 #define RUBY_RELEASE_CODE 20070908
#define RUBY_PATCHLEVEL 5000 #define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 6 #define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 8
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];