From da18671166e096dc375da5c547c3be38de0493fb Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 17 Aug 2014 14:23:54 -0400 Subject: [PATCH] Core: Fix undefined behavior in mem_map_funcs' WriteBlock function --- src/core/mem_map_funcs.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/core/mem_map_funcs.cpp b/src/core/mem_map_funcs.cpp index 5772cca523..ecdaa06d79 100644 --- a/src/core/mem_map_funcs.cpp +++ b/src/core/mem_map_funcs.cpp @@ -289,11 +289,15 @@ void Write64(const u32 addr, const u64 data) { void WriteBlock(const u32 addr, const u8* data, const int size) { int offset = 0; - while (offset < (size & ~3)) - Write32(addr + offset, *(u32*)&data[offset += 4]); + while (offset < (size & ~3)) { + Write32(addr + offset, *(u32*)&data[offset]); + offset += 4; + } - if (size & 2) - Write16(addr + offset, *(u16*)&data[offset += 2]); + if (size & 2) { + Write16(addr + offset, *(u16*)&data[offset]); + offset += 2; + } if (size & 1) Write8(addr + offset, data[offset]);