From 4e2f3bd9eb3eb3f8ac7e4feae0a5280244868cdd Mon Sep 17 00:00:00 2001 From: matz Date: Sat, 8 Sep 2007 01:08:23 +0000 Subject: * struct.c (rb_struct_s_members): check if __members__ is an array to prevent segmentation fault. [ruby-dev:31759] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13410 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ struct.c | 3 +++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index e09447e5e..5d59454c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ +<<<<<<< current Sat Sep 8 09:33:09 2007 Tadayoshi Funaba * lib/date/format.rb (str[fp]time): now check specifications more strictly. +======= +Sat Sep 8 10:05:14 2007 Yukihiro Matsumoto + + * struct.c (rb_struct_s_members): check if __members__ is an + array to prevent segmentation fault. [ruby-dev:31759] + +>>>>>>> patched Sat Sep 8 02:56:31 2007 Yukihiro Matsumoto * test/ruby/test_fiber.rb (TestFiber::test_throw): uncaught throw diff --git a/struct.c b/struct.c index f87b33b05..671788fc1 100644 --- a/struct.c +++ b/struct.c @@ -39,6 +39,9 @@ rb_struct_s_members(VALUE klass) if (NIL_P(members)) { rb_raise(rb_eTypeError, "uninitialized struct"); } + if (TYPE(members) != T_ARRAY) { + rb_raise(rb_eTypeError, "corrupted struct"); + } return members; } -- cgit