From d0a854af24839f665a04eaeb3f828c79587568cc Mon Sep 17 00:00:00 2001 From: Richard Guenther Date: Thu, 19 Apr 2012 12:44:07 +0000 Subject: [PATCH] ira-int.h (ira_allocno_object_iter_cond): Avoid out-of-bound array access. 2012-04-19 Richard Guenther * ira-int.h (ira_allocno_object_iter_cond): Avoid out-of-bound array access. From-SVN: r186590 --- gcc/ChangeLog | 5 +++++ gcc/ira-int.h | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 086b8136f50..5d127ca9e87 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2012-04-19 Richard Guenther + + * ira-int.h (ira_allocno_object_iter_cond): Avoid out-of-bound + array access. + 2012-04-19 Georg-Johann Lay PR target/53033 diff --git a/gcc/ira-int.h b/gcc/ira-int.h index 24976d0418c..5db2ccc268c 100644 --- a/gcc/ira-int.h +++ b/gcc/ira-int.h @@ -1138,8 +1138,13 @@ static inline bool ira_allocno_object_iter_cond (ira_allocno_object_iterator *i, ira_allocno_t a, ira_object_t *o) { - *o = ALLOCNO_OBJECT (a, i->n); - return i->n++ < ALLOCNO_NUM_OBJECTS (a); + int n = i->n++; + if (n < ALLOCNO_NUM_OBJECTS (a)) + { + *o = ALLOCNO_OBJECT (a, n); + return true; + } + return false; } /* Loop over all objects associated with allocno A. In each -- 2.30.2