VERY experimental Nintendo Switch 2 emulator
C++
Avoid depop out of bounds
Kelebek1c7ea6ef8a329
diff --git a/src/audio_core/renderer/command/command_buffer.cpp b/src/audio_core/renderer/command/command_buffer.cppindex 40074cf14a..2ef879ee18 100644--- a/src/audio_core/renderer/command/command_buffer.cpp+++ b/src/audio_core/renderer/command/command_buffer.cpp@@ -339,7 +339,7 @@ void CommandBuffer::GenerateDepopPrepareCommand(const s32 node_id, const VoiceStcmd.previous_samples = memory_pool->Translate(CpuAddr(voice_state.previous_samples.data()),MaxMixBuffers * sizeof(s32));cmd.buffer_count = buffer_count;- cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer_count * sizeof(s32));+ cmd.depop_buffer = memory_pool->Translate(CpuAddr(buffer.data()), buffer.size_bytes());GenerateEnd<DepopPrepareCommand>(cmd);}diff --git a/src/audio_core/renderer/command/mix/depop_prepare.cpp b/src/audio_core/renderer/command/mix/depop_prepare.cppindex 2ee076ef6b..69bb78ccc8 100644--- a/src/audio_core/renderer/command/mix/depop_prepare.cpp+++ b/src/audio_core/renderer/command/mix/depop_prepare.cpp@@ -19,7 +19,7 @@ void DepopPrepareCommand::Dump([[maybe_unused]] const ADSP::CommandListProcessorvoid DepopPrepareCommand::Process(const ADSP::CommandListProcessor& processor) {auto samples{reinterpret_cast<s32*>(previous_samples)};- auto buffer{std::span(reinterpret_cast<s32*>(depop_buffer), buffer_count)};+ auto buffer{reinterpret_cast<s32*>(depop_buffer)};for (u32 i = 0; i < buffer_count; i++) {if (samples[i]) {