Validate the fnIdx for a file segment when doing a sanity check.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5919

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 0538fe62accc341ff0ffd49f59337cb354fe0b35..5d40fcdba58017f20ff0304ea69063c8c3c52085 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -932,6 +932,8 @@ static Bool sane_NSegment ( NSegment* s )
       case SkFileC: case SkFileV:
          return 
             s->smode == SmFixed
+            && (s->fnIdx == -1 ||
+                (s->fnIdx >= 0 && s->fnIdx < segnames_used && segnames[s->fnIdx].inUse))
             && !s->isCH;
 
       case SkResvn: