[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

Alexandre Julliard julliard at winehq.org
Sun Jun 17 20:02:54 UTC 2012


The following commit has been merged in the wheezy branch:
commit f26f1e7ef08d535149b5314cb625427f697bdaa1
Author: Thomas Faber <thfabba at gmx.de>
Date:   Wed Mar 28 13:30:08 2012 +0200

    dbghelp: Fix uninitialized variable usage.
    (cherry picked from commit 9f0119a0c07cd52bbac31706f80db5f71524977c)

diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index 711c78c..29f4c6f 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -313,6 +313,7 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc,
             }
             return FALSE;
         case 0x83: /* add $n,%rsp */
+            if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
             if (op0 == 0x48 && op2 == 0xc4)
             {
                 pc += 4;
@@ -320,6 +321,7 @@ static BOOL is_inside_epilog(struct cpu_stack_walk* csw, DWORD64 pc,
             }
             return FALSE;
         case 0x8d: /* lea n(reg),%rsp */
+            if (!sw_read_mem(csw, pc + 2, &op2, 1)) return FALSE;
             if (op0 & 0x06) return FALSE;  /* rex.RX must be cleared */
             if (((op2 >> 3) & 7) != 4) return FALSE;  /* dest reg mus be %rsp */
             if ((op2 & 7) == 4) return FALSE;  /* no SIB byte allowed */

-- 
Debian Wine packaging



More information about the pkg-wine-party mailing list