From: Julian Seward <jseward@acm.org>
Date: Mon, 11 Sep 2006 19:49:35 +0000 (+0000)
Subject: When unmapping segments from below aspacem_minAddr, convert them back
X-Git-Tag: svn/VALGRIND_3_3_0~683
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b074dfb65f6b6a33c643281e545a5b546dec61fe;p=thirdparty%2Fvalgrind.git

When unmapping segments from below aspacem_minAddr, convert them back
into SkResvns, not SkFrees.  Fixes #133694.  Thanks to Tom Hughes for
patch and test case.



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

diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 41a8616b74..c410deccb4 100644
--- 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;