[Valgrind-developers] valgrind: r5616 - trunk/memcheck/tests

[<sv...@va...>]

Author: sewardj
Date: 2006-02-06 23:22:31 +0000 (Mon, 06 Feb 2006)
New Revision: 5616

Log:
This causes problems on setups where ld.so is mapped at just over 1M:
it zeroes out that area (as a result of one of the mmaps) and the
program consequently goes into an infinite loop.  Change the map sizes
to just one page to avoid that.

Modified:
   trunk/memcheck/tests/zeropage.c


Modified: trunk/memcheck/tests/zeropage.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/zeropage.c	2006-02-06 05:31:37 UTC (rev 5615)
+++ trunk/memcheck/tests/zeropage.c	2006-02-06 23:22:31 UTC (rev 5616)
@@ -11,25 +11,25 @@
 int main(void)
 {
    /* mmap(0x0, ... FIXED) should fail */
-   int* m =3D mmap(0x0, 1000000, PROT_READ|PROT_WRITE,=20
+   int* m =3D mmap(0x0, 4096, PROT_READ|PROT_WRITE,=20
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m !=3D (int*)-1)
       printf("succeeded?!\n");
=20
    /* mmap(0x1000, ... FIXED) should fail */
-        m =3D mmap((void*)0x1000, 1000000, PROT_READ|PROT_WRITE,=20
+        m =3D mmap((void*)0x1000, 4096, PROT_READ|PROT_WRITE,=20
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m !=3D (int*)-1)
       printf("succeeded?!\n");
=20
    /* mmap(0xa000, ... FIXED) should fail */
-        m =3D mmap((void*)0xa000, 1000000, PROT_READ|PROT_WRITE,=20
+        m =3D mmap((void*)0xa000, 4096, PROT_READ|PROT_WRITE,=20
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m !=3D (int*)-1)
       printf("succeeded?!\n");
=20
    /* mmap(0x10000, ... FIXED) should fail */
-        m =3D mmap((void*)0x10000, 1000000, PROT_READ|PROT_WRITE,=20
+        m =3D mmap((void*)0x10000, 4096, PROT_READ|PROT_WRITE,=20
                  MAP_PRIVATE|MAP_ANON|MAP_FIXED, -1, 0);
    if (m =3D=3D (int*)-1)
       printf("failed?!\n");