From: Florian Krohm <florian@eich-krohm.de>
Date: Sat, 3 Mar 2012 18:46:05 +0000 (+0000)
Subject: Avoid possibly unaligned memory access.
X-Git-Tag: svn/VALGRIND_3_8_0~438
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d58aa28f8248fdab2e489145f6b0803dd34bdb2e;p=thirdparty%2Fvalgrind.git

Avoid possibly unaligned memory access.


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

diff --git a/memcheck/mc_main.c b/memcheck/mc_main.c
index 756ab1b7d2..d83994f780 100644
--- a/memcheck/mc_main.c
+++ b/memcheck/mc_main.c
@@ -3884,19 +3884,19 @@ static UInt mb_get_origin_for_guest_offset ( ThreadId tid,
                                              Int offset, SizeT size )
 {
    Int   sh2off;
-   UChar area[6];
+   UInt  area[3];
    UInt  otag;
    sh2off = MC_(get_otrack_shadow_offset)( offset, size );
    if (sh2off == -1)
       return 0;  /* This piece of guest state is not tracked */
    tl_assert(sh2off >= 0);
    tl_assert(0 == (sh2off % 4));
-   area[0] = 0x31;
-   area[5] = 0x27;
-   VG_(get_shadow_regs_area)( tid, &area[1], 2/*shadowno*/,sh2off,4 );
-   tl_assert(area[0] == 0x31);
-   tl_assert(area[5] == 0x27);
-   otag = *(UInt*)&area[1];
+   area[0] = 0x31313131;
+   area[2] = 0x27272727;
+   VG_(get_shadow_regs_area)( tid, (UChar *)&area[1], 2/*shadowno*/,sh2off,4 );
+   tl_assert(area[0] == 0x31313131);
+   tl_assert(area[2] == 0x27272727);
+   otag = area[1];
    return otag;
 }