From: Eric Botcazou <ebotcazou@libertysurf.fr>
Date: Wed, 5 Mar 2003 09:00:43 +0000 (+0100)
Subject: re PR c/9799 (mismatching structure initializer with nested flexible array member... 
X-Git-Tag: releases/gcc-3.2.3~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9419139895f40660bfe5c2e1075891c580779839;p=thirdparty%2Fgcc.git

re PR c/9799 (mismatching structure initializer with nested flexible array member, segfaults)

	PR c/9799
	* c-typeck.c (push_init_level): Add sanity check.

From-SVN: r63835
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2035fa9d68c1..5d7f88892d03 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-05  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	PR c/9799
+	* c-typeck.c (push_init_level): Add sanity check.
+
 2003-02-28  Bob Wilson  <bob.wilson@acm.org>
 
 	Backport following patch:
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 17e314489ea7..1d86fbaa9561 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -5292,6 +5292,7 @@ push_init_level (implicit)
 	  && constructor_fields == 0)
 	process_init_element (pop_init_level (1));
       else if (TREE_CODE (constructor_type) == ARRAY_TYPE
+	       && constructor_max_index 
 	       && tree_int_cst_lt (constructor_max_index, constructor_index))
 	process_init_element (pop_init_level (1));
       else
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 22f578bbb3e7..6eb7302f8831 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-05  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+	* gcc.c-torture/compile/20030305-1.c
+
 2003-02-25  Franz Sirl  <Franz.Sirl-kernel@lauterbach.com>
 
 	PR target/9732