Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vk_blit_screen: Fix non-accelerated texture size calculation

Browse source 
Addresses the potential OOB access in UnswizzleTexture.
This commit is contained in:
ameerj 2021-08-16 14:28:10 -04:00
parent bdd617da03
commit 537c6ac8fe
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/video_core/textures/decoders.cpp
View file

@ -63,14 +63,6 @@ void SwizzleImpl(std::span<u8> output, std::span<const u8> input, u32 width, u32
const u32 unswizzled_offset =
slice * pitch * height + line * pitch + column * BYTES_PER_PIXEL;
if (const auto offset = (TO_LINEAR ? unswizzled_offset : swizzled_offset);
offset >= input.size()) {
// TODO(Rodrigo): This is an out of bounds access that should never happen. To
// avoid crashing the emulator, break.
ASSERT_MSG(false, "offset {} exceeds input size {}!", offset, input.size());
break;
}
u8* const dst = &output[TO_LINEAR ? swizzled_offset : unswizzled_offset];
const u8* const src = &input[TO_LINEAR ? unswizzled_offset : swizzled_offset];