aboutsummaryrefslogtreecommitdiff
path: root/src/video_core/command_classes
diff options
context:
space:
mode:
authorameerj <52414509+ameerj@users.noreply.github.com>2021-10-08 01:22:38 -0400
committerameerj <52414509+ameerj@users.noreply.github.com>2021-10-08 01:22:38 -0400
commit92bd5571cdd47b94fef569c09e7e155185ee78e7 (patch)
tree5ac804c64f72bb16dd8c1477db71cf35419e18a7 /src/video_core/command_classes
parent71698d7351dd10cdaa7e22ae6ac5577564cee026 (diff)
vic: Avoid memory corruption when multiple streams with different dimensions are decoded
This is a work around to avoid buffer overflow errors until multi channel/multi stream decoding is supported.
Diffstat (limited to 'src/video_core/command_classes')
-rw-r--r--src/video_core/command_classes/vic.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/video_core/command_classes/vic.cpp b/src/video_core/command_classes/vic.cpp
index 3f2712a8d3..51f739801a 100644
--- a/src/video_core/command_classes/vic.cpp
+++ b/src/video_core/command_classes/vic.cpp
@@ -85,6 +85,15 @@ void Vic::Execute() {
if (!frame) {
return;
}
+ const u64 surface_width = config.surface_width_minus1 + 1;
+ const u64 surface_height = config.surface_height_minus1 + 1;
+ if (static_cast<u64>(frame->width) != surface_width ||
+ static_cast<u64>(frame->height) != surface_height) {
+ // TODO: Properly support multiple video streams with differing frame dimensions
+ LOG_WARNING(Debug, "Frame dimensions {}x{} do not match expected surface dimensions {}x{}",
+ frame->width, frame->height, surface_width, surface_height);
+ return;
+ }
switch (config.pixel_format) {
case VideoPixelFormat::RGBA8:
case VideoPixelFormat::BGRA8: