From: Florian Krohm <florian@eich-krohm.de>
Date: Mon, 6 Jul 2015 20:22:16 +0000 (+0000)
Subject: Revert an accidental change to the address space manager that sneaked
X-Git-Tag: svn/VALGRIND_3_11_0~249
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20efd8765916c4e683d83637c4115b5d16ab7597;p=thirdparty%2Fvalgrind.git

Revert an accidental change to the address space manager that sneaked
in in r15394.


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

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index a41d4dc093..5ec5aeed8c 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -2829,9 +2829,9 @@ const NSegment *VG_(am_extend_into_adjacent_reservation_client)( Addr addr,
       }
 
       /* Ok, success with the kernel.  Update our structures. */
-      NSegment seg_copy = nsegments[segA];
-      seg_copy.end += delta;
-      add_segment(&seg_copy);
+      nsegments[segR].start += delta;
+      nsegments[segA].end += delta;
+      aspacem_assert(nsegments[segR].start <= nsegments[segR].end);
 
    } else {
 
@@ -2868,9 +2868,9 @@ const NSegment *VG_(am_extend_into_adjacent_reservation_client)( Addr addr,
       }
 
       /* Ok, success with the kernel.  Update our structures. */
-      NSegment seg_copy = nsegments[segA];
-      seg_copy.start -= delta;
-      add_segment(&seg_copy);
+      nsegments[segR].end -= delta;
+      nsegments[segA].start -= delta;
+      aspacem_assert(nsegments[segR].start <= nsegments[segR].end);
    }
 
    AM_SANITY_CHECK;