diff options
| author | bunnei <bunneidev@gmail.com> | 2021-06-07 10:51:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 10:51:17 -0700 |
| commit | df91c9f5e68c253d5e60d26e8d35e6bc423f0571 (patch) | |
| tree | b885455018581804972d171232f3c91ee009b2e8 | |
| parent | 28eb8c83d479403b5da88ae7d3d2a1c6b81a6552 (diff) | |
| parent | 287a0f72a5474a5c8c8cdf2b15fb61532e11ec61 (diff) | |
Merge pull request #6410 from lat9nq/avoid-oob
decoders: Avoid out-of-bounds access
| -rw-r--r-- | src/video_core/textures/decoders.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/video_core/textures/decoders.cpp b/src/video_core/textures/decoders.cpp index 3a463d5db6..f1f523ad10 100644 --- a/src/video_core/textures/decoders.cpp +++ b/src/video_core/textures/decoders.cpp @@ -63,6 +63,14 @@ void Swizzle(std::span<u8> output, std::span<const u8> input, u32 bytes_per_pixe 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]; std::memcpy(dst, src, bytes_per_pixel); |