PR gprof/13325

	* hist.c (hist_assign_samples_1): Make sure that inner loop
	iterator remains valid.

diff --git a/gprof/ChangeLog b/gprof/ChangeLog
index fd989950aa9e229115bcccdcaa7be88a4bb488c0..20464e8da1f8b2af303e21e72a7a9f96549578a3 100644 (file)
--- 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 25364b215e823fe633a7823f0d7a895db547a3ee..572bacfb22a11b5095179526b57876aa27d089a7 100644 (file)
--- 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.  */