Consider blocks with both SF_MMAP and SF_STACK set as part of the root

memory set as any additional stack space allocated by valgrind will
have both flags set. This fixes bug #106293.

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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 7de7bdbb35e7878089a82aa9b8f3529b5e6ed786..92d67b4b70ba3b661ee910bb09ccd9e6d6784174 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -1185,7 +1185,7 @@ void VG_(find_root_memory)(void (*add_rootrange)(Addr a, SizeT sz))
    for (i = 0; i < segments_used; i++) {
       s = &segments[i];
       flags = s->flags & (SF_SHARED|SF_MMAP|SF_VALGRIND|SF_CORE|SF_STACK);
-      if (flags != SF_MMAP && flags != SF_STACK)
+      if (flags != SF_MMAP && flags != SF_STACK && flags != (SF_MMAP|SF_STACK))
          continue;
       if ((s->prot & (VKI_PROT_READ|VKI_PROT_WRITE)) 
           != (VKI_PROT_READ|VKI_PROT_WRITE))