Merge r6040 (fix for: 'cfsi->len > 0 && cfsi->len < 2000000' failed)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6041

diff --git a/coregrind/m_debuginfo/storage.c b/coregrind/m_debuginfo/storage.c
index 066cb920eaba2c61c9a45b749fac1de42663b43b..2f103a90365c0be3944aa47150aa163e7d75d13b 100644 (file)
--- a/coregrind/m_debuginfo/storage.c
+++ b/coregrind/m_debuginfo/storage.c
@@ -308,7 +308,13 @@ void ML_(addDiCfSI) ( struct _SegInfo* si, DiCfSI* cfsi )
       ML_(ppDiCfSI)(cfsi);
    }
 
-   vg_assert(cfsi->len > 0 && cfsi->len < 2000000);
+   /* sanity */
+   vg_assert(cfsi->len > 0);
+   /* If this fails, the implication is you have a single procedure
+      with more than 5 million bytes of code.  Which is pretty
+      unlikely.  Either that, or the debuginfo reader is somehow
+      broken. */
+   vg_assert(cfsi->len < 5000000);
 
    /* Rule out ones which are completely outside the segment.  These
       probably indicate some kind of bug, but for the meantime ignore