Matteo Bruni : ntdll: Use memcpy() in set_float_reg().

Alexandre Julliard julliard at winehq.org
Mon May 25 15:44:22 CDT 2020


Module: wine
Branch: master
Commit: 2e5c2c7cdb11cae3a2b78bb0794368f431538efb
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2e5c2c7cdb11cae3a2b78bb0794368f431538efb

Author: Matteo Bruni <mbruni at codeweavers.com>
Date:   Fri May 22 20:39:59 2020 +0200

ntdll: Use memcpy() in set_float_reg().

The source address might not be aligned although the compiler can
expect alignment when using a plain assignment.

Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/signal_x86_64.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
index 31af1e98d3..e92470e960 100644
--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -3298,7 +3298,8 @@ static void set_int_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_pt
 
 static void set_float_reg( CONTEXT *context, KNONVOLATILE_CONTEXT_POINTERS *ctx_ptr, int reg, M128A *val )
 {
-    *(&context->u.s.Xmm0 + reg) = *val;
+    /* Use a memcpy() to avoid issues if val is misaligned. */
+    memcpy(&context->u.s.Xmm0 + reg, val, sizeof(*val));
     if (ctx_ptr) ctx_ptr->u.FloatingContext[reg] = val;
 }
 




More information about the wine-cvs mailing list