diff options
| author | Mark Kettenis <kettenis@openbsd.org> | 2012-09-09 10:06:13 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@gcc.gnu.org> | 2012-09-09 10:06:13 +0000 |
| commit | d5f8c6dc8cb56bb0536d81a3916639d3fdd1481b (patch) | |
| tree | f5d615c2c207d91527cd526f9d7f892a33e227cd | |
| parent | bc1b72c78feb2ebb0e67d8104f6e960ac6a808fa (diff) | |
| download | gcc-d5f8c6dc8cb56bb0536d81a3916639d3fdd1481b.zip gcc-d5f8c6dc8cb56bb0536d81a3916639d3fdd1481b.tar.gz gcc-d5f8c6dc8cb56bb0536d81a3916639d3fdd1481b.tar.bz2 | |
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
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0fea1a6..371fdfe 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +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 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index f86c54f..7655f78 100644 --- 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). */ |