decl.c (reshape_init_class): Avoid dereferencing a past-the-end pointer.

* decl.c (reshape_init_class): Avoid dereferencing a past-the-end pointer. From-SVN: r191106

decl.c (reshape_init_class): Avoid dereferencing a past-the-end pointer.
* decl.c (reshape_init_class): Avoid dereferencing a past-the-end pointer. From-SVN: r191106
d5f8c6dc · Mark Kettenis · Gerald Pfeifer · bc1b72c7 · d5f8c6dc · d5f8c6dc
Commit d5f8c6dc authored Sep 09, 2012 by Mark Kettenis Committed by Gerald Pfeifer Sep 09, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

gcc/cp/ChangeLog
+5 -0

gcc/cp/decl.c
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
+2012-09-09  Mark Kettenis  <kettenis@openbsd.org>
+
+	* decl.c (reshape_init_class): Avoid dereferencing a
+	past-the-end pointer.
+		  
 2012-09-07  Paolo Carlini  <paolo.carlini@oracle.com>

 	* pt.c (num_template_headers_for_class): Rework per the code

--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -5131,7 +5131,7 @@ reshape_init_class (tree type, reshape_iter *d, bool first_initializer_p,
      if (field_init == error_mark_node)
 	return error_mark_node;

-      if (d->cur->index && d->cur == old_cur)
+      if (d->cur == old_cur && d->cur->index)
 	{
 	  /* This can happen with an invalid initializer for a flexible
 	     array member (c++/54441).  */