From 285d1171cb9cfb35d108728b8930d02c9df415ed Mon Sep 17 00:00:00 2001 From: Jordan Woyak Date: Tue, 17 Mar 2026 08:25:58 -0500 Subject: [PATCH] AMMediaboard: Prevent MediaBoardRange end from exceeding the underlying buffer size. --- Source/Core/Core/HW/DVD/AMMediaboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/Core/HW/DVD/AMMediaboard.cpp b/Source/Core/Core/HW/DVD/AMMediaboard.cpp index ad4e091648..9234e4e625 100644 --- a/Source/Core/Core/HW/DVD/AMMediaboard.cpp +++ b/Source/Core/Core/HW/DVD/AMMediaboard.cpp @@ -80,7 +80,8 @@ static constexpr u32 TEST_OK_WORD0 = 0x54455354; // "TEST" static constexpr u32 TEST_OK_WORD1 = 0x204F4B00; // " OK\0" MediaBoardRange::MediaBoardRange(u32 start_, u32 size_, std::span buffer_) - : start{start_}, end{start_ + size_}, buffer{buffer_.data()}, buffer_size{buffer_.size()} + : start{start_}, end{start_ + std::min(size_, u32(buffer_.size()))}, buffer{buffer_.data()}, + buffer_size{buffer_.size()} { }