Merge r6049 (fix for #133694, from Tom Hughes)

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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 41a8616b74ade510f9f631d20fa0e3cec9c354d1..c410deccb4081008dba86d3a3d7d87dd3ec2a12a 100644 (file)
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -2251,6 +2251,10 @@ Bool VG_(am_notify_munmap)( Addr start, SizeT len )
        && /* check previous comparison is meaningful */
           aspacem_maxAddr < Addr_MAX)
       seg.kind = SkResvn;
+   else 
+   /* Ditto for segments from below aspacem_minAddr. */
+   if (seg.end < aspacem_minAddr && aspacem_minAddr > 0)
+      seg.kind = SkResvn;
    else
       seg.kind = SkFree;