From: Nicholas Nethercote <n.nethercote@gmail.com>
Date: Sun, 11 Jul 2004 18:11:33 +0000 (+0000)
Subject: Add some more assertion checking where it was lacking.
X-Git-Tag: svn/VALGRIND_2_1_2~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9914c7fe6ee91075e0d458bca75fbd0bb5b398cd;p=thirdparty%2Fvalgrind.git

Add some more assertion checking where it was lacking.


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

diff --git a/coregrind/vg_mylibc.c b/coregrind/vg_mylibc.c
index ae95fd2424..b80b9e6497 100644
--- a/coregrind/vg_mylibc.c
+++ b/coregrind/vg_mylibc.c
@@ -405,12 +405,15 @@ void* VG_(brk) ( void* end_data_segment )
    }
 
    if (brkpage != endpage) {
-      if (brkpage > endpage)
-	 munmap_inner((void *)brkpage, brkpage-endpage);
-      else
-	 mmap_inner((void *)brkpage, endpage-brkpage, 
-		    VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
-		    VKI_MAP_FIXED|VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS, -1, 0);
+      if (brkpage > endpage) {
+         Int res = munmap_inner((void *)brkpage, brkpage-endpage);
+         vg_assert(0 == res);
+      } else {
+         Addr res = mmap_inner((void *)brkpage, endpage-brkpage, 
+                       VKI_PROT_READ|VKI_PROT_WRITE|VKI_PROT_EXEC,
+                       VKI_MAP_FIXED|VKI_MAP_PRIVATE|VKI_MAP_ANONYMOUS, -1, 0);
+         vg_assert((Addr)-1 != res);
+      }
    }
    VG_(curbrk) = (Char *)__curbrk = end_data_segment;