aboutsummaryrefslogtreecommitdiff
path: root/gprof
diff options
context:
space:
mode:
Diffstat (limited to 'gprof')
-rw-r--r--gprof/ChangeLog6
-rw-r--r--gprof/hist.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index fd98995..20464e8 100644
--- a/gprof/ChangeLog
+++ b/gprof/ChangeLog
@@ -1,3 +1,9 @@
+2011-10-25 Wei Guozhi <carrot@google.com>
+
+ PR gprof/13325
+ * hist.c (hist_assign_samples_1): Make sure that inner loop
+ iterator remains valid.
+
2011-10-24 Nick Clifton <nickc@redhat.com>
* po/ja.po: New Japanese translation.
diff --git a/gprof/hist.c b/gprof/hist.c
index 25364b2..572bacf 100644
--- a/gprof/hist.c
+++ b/gprof/hist.c
@@ -398,7 +398,12 @@ hist_assign_samples_1 (histogram *r)
/* If high end of bin is below entry address,
go for next bin. */
if (bin_high_pc < sym_low_pc)
- break;
+ {
+ /* PR gprof/13325: Make sure that j does not go below 1. */
+ if (j < 1)
+ j = 1;
+ break;
+ }
/* If low end of bin is above high end of symbol,
go for next symbol. */