GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2025-01-28 06:47:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Account for OOB copyOffsets in CircularBuffer::Read

Browse Source 
Caused crashes in Pokemon
This commit is contained in:
Billy Laws 2022-05-14 15:30:59 +01:00
parent 0a3cf25823
commit 72473369b6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/cpp/skyline/common/circular_buffer.h
View File

@ -48,7 +48,7 @@ namespace skyline {
size = sizeBegin + sizeEnd; size = sizeBegin + sizeEnd;
} }
if (copyFunction && copyOffset) { if (copyFunction && (copyOffset != 0 && copyOffset < sizeEnd)) {
auto sourceEnd{start + ((copyOffset != -1) ? copyOffset : sizeEnd)}; auto sourceEnd{start + ((copyOffset != -1) ? copyOffset : sizeEnd)};
for (auto source{start}, destination{pointer}; source < sourceEnd; source++, destination++) for (auto source{start}, destination{pointer}; source < sourceEnd; source++, destination++)
@ -59,6 +59,8 @@ namespace skyline {
copyOffset -= sizeEnd; copyOffset -= sizeEnd;
} }
} else { } else {
if (copyOffset)
copyOffset -= static_cast<size_t>(sizeEnd) * sizeof(Type);
std::memcpy(pointer, start, static_cast<size_t>(sizeEnd) * sizeof(Type)); std::memcpy(pointer, start, static_cast<size_t>(sizeEnd) * sizeof(Type));
} }