From: Julian Seward <jseward@acm.org>
Date: Sat, 5 May 2007 16:46:21 +0000 (+0000)
Subject: Merge r6728 (Fix stack overflow which lead to totally mysterious .bss
X-Git-Tag: svn/VALGRIND_3_2_3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72818647bd7e107fcb7ae9b6ecc4e1811c812696;p=thirdparty%2Fvalgrind.git

Merge r6728 (Fix stack overflow which lead to totally mysterious .bss
corruption)



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

diff --git a/coregrind/m_ume.c b/coregrind/m_ume.c
index 837a3899ce..4d510c9f26 100644
--- a/coregrind/m_ume.c
+++ b/coregrind/m_ume.c
@@ -553,8 +553,8 @@ static Int do_exec_inner(const HChar* exe, ExeInfo* info);
 /* returns: 0 = success, non-0 is failure */
 static Int load_script(Int fd, const HChar* name, ExeInfo* info)
 {
-   Char  hdr[VKI_MAX_PAGE_SIZE];
-   Int   len = VKI_PAGE_SIZE;
+   Char  hdr[4096];
+   Int   len = 4096;
    Int   eol;
    Char* interp;
    Char* end;
@@ -628,8 +628,8 @@ SysRes VG_(pre_exec_check)(const HChar* exe_name, Int* out_fd)
 {
    Int fd, ret;
    SysRes res;
-   Char  buf[VKI_MAX_PAGE_SIZE];
-   SizeT bufsz = VKI_PAGE_SIZE, fsz;
+   Char  buf[4096];
+   SizeT bufsz = 4096, fsz;
 
    // Check it's readable
    res = VG_(open)(exe_name, VKI_O_RDONLY, 0);