Merge r5974 (fix for: Expanding brk() into last available page asserts)

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

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index 241dc751b61f4562513a6a4d32fcda9ae9126e92..322b02464e1283ad6a44fbb00939f17661397ac9 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -989,14 +989,14 @@ static Addr do_brk ( Addr newbrk )
       return newbrk;
    }
 
-   if (newbrk >= rseg->end+1 - VKI_PAGE_SIZE) {
+   if (newbrk > rseg->end+1 - VKI_PAGE_SIZE) {
       /* request is too large -- the resvn would fall below 1 page,
          which isn't allowed. */
       goto bad;
    }
 
    newbrkP = VG_PGROUNDUP(newbrk);
-   vg_assert(newbrkP > rseg->start && newbrkP < rseg->end+1 - VKI_PAGE_SIZE);
+   vg_assert(newbrkP > rseg->start && newbrkP <= rseg->end+1 - VKI_PAGE_SIZE);
    delta = newbrkP - rseg->start;
    vg_assert(delta > 0);
    vg_assert(VG_IS_PAGE_ALIGNED(delta));