From 0cbe8b526300fbc0100a6e2d9e6644e35ddc7808 Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 1 Jun 2005 15:03:09 +0000
Subject: * struct.c: accessing >10 member caused segmentation fault.
 [ruby-dev:26247] * test/ruby/test_struct.rb: test it.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@8546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 struct.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'struct.c')

diff --git a/struct.c b/struct.c
index f0458a352..17fc72b1e 100644
--- a/struct.c
+++ b/struct.c
@@ -132,7 +132,9 @@ static VALUE rb_struct_ref7(obj) VALUE obj; {return RSTRUCT(obj)->ptr[7];}
 static VALUE rb_struct_ref8(obj) VALUE obj; {return RSTRUCT(obj)->ptr[8];}
 static VALUE rb_struct_ref9(obj) VALUE obj; {return RSTRUCT(obj)->ptr[9];}
 
-static VALUE (*ref_func[10])() = {
+#define N_REF_FUNC (sizeof(ref_func) / sizeof(VALUE (*)()))
+
+static VALUE (*ref_func[])() = {
     rb_struct_ref0,
     rb_struct_ref1,
     rb_struct_ref2,
@@ -211,7 +213,7 @@ make_struct(name, members, klass)
     for (i=0; i< RARRAY(members)->len; i++) {
 	ID id = SYM2ID(RARRAY(members)->ptr[i]);
 	if (rb_is_local_id(id) || rb_is_const_id(id)) {
-	    if (i<sizeof(ref_func)) {
+	    if (i < N_REF_FUNC) {
 		rb_define_method_id(nstr, id, ref_func[i], 0);
 	    }
 	    else {
-- 
cgit