diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/profile.c | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7191a15..5e43601 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2012-11-21 Teresa Johnson <tejohnson@google.com> + + PR gcov-profile/55417 + * profile.c (compute_working_sets): Check index first + to avoid out-of-bounds array access. + 2012-11-21 Matthias Klose <doko@ubuntu.com> * config/aarch64/t-aarch64-linux: Define MULTIARCH_DIRNAME for @@ -1400,7 +1406,7 @@ * cppdefault.h (default_include): Document multiarch in multilib member. * cppdefault.c: [LOCAL_INCLUDE_DIR, STANDARD_INCLUDE_DIR] Add an - include directory for multiarch directories. + include directory for multiarch directories. * common.opt: New options --print-multiarch and -imultilib. * config.gcc <i[34567]86-*-linux* | x86_64-*-linux*> (tmake_file): Include i386/t-linux. diff --git a/gcc/profile.c b/gcc/profile.c index 194ef91..bbe02b1 100644 --- a/gcc/profile.c +++ b/gcc/profile.c @@ -288,11 +288,11 @@ compute_working_sets (void) else tmp_cum = cum + histo_bucket->cum_value; - /* Next walk through successive working set entries and fill in - the statistics for any whose size we have reached by accumulating - this histogram counter. */ - while (tmp_cum >= working_set_cum_values[ws_ix] - && ws_ix < NUM_GCOV_WORKING_SETS) + /* Next walk through successive working set entries and fill in + the statistics for any whose size we have reached by accumulating + this histogram counter. */ + while (ws_ix < NUM_GCOV_WORKING_SETS + && tmp_cum >= working_set_cum_values[ws_ix]) { gcov_working_sets[ws_ix].num_counters = count; gcov_working_sets[ws_ix].min_counter |