diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-08-17 14:23:54 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-08-17 14:23:54 -0400 |
| commit | da18671166e096dc375da5c547c3be38de0493fb (patch) | |
| tree | 2963df3c0857fe35238fdafc99290abf9733e959 /src/core/mem_map_funcs.cpp | |
| parent | d1c2b76ad1687c4ccf5673d593de3b7f8710a9c0 (diff) | |
Core: Fix undefined behavior in mem_map_funcs' WriteBlock function
Diffstat (limited to 'src/core/mem_map_funcs.cpp')
| -rw-r--r-- | src/core/mem_map_funcs.cpp | 12 |
1 files 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]); |