summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-07-02 04:38:10 +0200
committerGitHub <noreply@github.com>2023-07-02 04:38:10 +0200
commit7f5ccd015137662247d39b723d120a18f380fa3e (patch)
treec796c0dc12a45cba27ec59802ca2b369306e28ce /src
parentMerge pull request #10950 from german77/mouse_tune (diff)
parentsink_stream: Resolve heap buffer corruption due to out of bounds write (diff)
downloadyuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar.gz
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar.bz2
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar.lz
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar.xz
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.tar.zst
yuzu-7f5ccd015137662247d39b723d120a18f380fa3e.zip
Diffstat (limited to 'src')
-rw-r--r--src/audio_core/sink/sink_stream.cpp34
-rw-r--r--src/audio_core/sink/sink_stream.h3
2 files changed, 20 insertions, 17 deletions
diff --git a/src/audio_core/sink/sink_stream.cpp b/src/audio_core/sink/sink_stream.cpp
index 404dcd0e9..6081352a2 100644
--- a/src/audio_core/sink/sink_stream.cpp
+++ b/src/audio_core/sink/sink_stream.cpp
@@ -12,6 +12,7 @@
#include "audio_core/sink/sink_stream.h"
#include "common/common_types.h"
#include "common/fixed_point.h"
+#include "common/scope_exit.h"
#include "common/settings.h"
#include "core/core.h"
#include "core/core_timing.h"
@@ -19,9 +20,12 @@
namespace AudioCore::Sink {
void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
- if (type == StreamType::In) {
+ SCOPE_EXIT({
queue.enqueue(buffer);
- queued_buffers++;
+ ++queued_buffers;
+ });
+
+ if (type == StreamType::In) {
return;
}
@@ -66,16 +70,17 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
static_cast<s16>(std::clamp(right_sample, min, max));
}
- samples = samples.subspan(0, samples.size() / system_channels * device_channels);
+ samples_buffer.Push(samples.subspan(0, samples.size() / system_channels * device_channels));
+ return;
+ }
- } else if (system_channels == 2 && device_channels == 6) {
+ if (system_channels == 2 && device_channels == 6) {
// We need moar samples! Not all games will provide 6 channel audio.
// TODO: Implement some upmixing here. Currently just passthrough, with other
// channels left as silence.
- auto new_size = samples.size() / system_channels * device_channels;
- tmp_samples.resize_destructive(new_size);
+ std::vector<s16> new_samples(samples.size() / system_channels * device_channels);
- for (u32 read_index = 0, write_index = 0; read_index < new_size;
+ for (u32 read_index = 0, write_index = 0; read_index < samples.size();
read_index += system_channels, write_index += device_channels) {
const auto left_sample{static_cast<s16>(std::clamp(
static_cast<s32>(
@@ -83,7 +88,7 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
volume),
min, max))};
- tmp_samples[write_index + static_cast<u32>(Channels::FrontLeft)] = left_sample;
+ new_samples[write_index + static_cast<u32>(Channels::FrontLeft)] = left_sample;
const auto right_sample{static_cast<s16>(std::clamp(
static_cast<s32>(
@@ -91,20 +96,21 @@ void SinkStream::AppendBuffer(SinkBuffer& buffer, std::span<s16> samples) {
volume),
min, max))};
- tmp_samples[write_index + static_cast<u32>(Channels::FrontRight)] = right_sample;
+ new_samples[write_index + static_cast<u32>(Channels::FrontRight)] = right_sample;
}
- samples = std::span<s16>(tmp_samples);
- } else if (volume != 1.0f) {
- for (u32 i = 0; i < samples.size(); i++) {
+ samples_buffer.Push(new_samples);
+ return;
+ }
+
+ if (volume != 1.0f) {
+ for (u32 i = 0; i < samples.size(); ++i) {
samples[i] = static_cast<s16>(
std::clamp(static_cast<s32>(static_cast<f32>(samples[i]) * volume), min, max));
}
}
samples_buffer.Push(samples);
- queue.enqueue(buffer);
- queued_buffers++;
}
std::vector<s16> SinkStream::ReleaseBuffer(u64 num_samples) {
diff --git a/src/audio_core/sink/sink_stream.h b/src/audio_core/sink/sink_stream.h
index 98d72ace1..6a4996ca3 100644
--- a/src/audio_core/sink/sink_stream.h
+++ b/src/audio_core/sink/sink_stream.h
@@ -16,7 +16,6 @@
#include "common/polyfill_thread.h"
#include "common/reader_writer_queue.h"
#include "common/ring_buffer.h"
-#include "common/scratch_buffer.h"
#include "common/thread.h"
namespace Core {
@@ -256,8 +255,6 @@ private:
/// Signalled when ring buffer entries are consumed
std::condition_variable_any release_cv;
std::mutex release_mutex;
- /// Temporary buffer for appending samples when upmixing
- Common::ScratchBuffer<s16> tmp_samples{};
};
using SinkStreamPtr = std::unique_ptr<SinkStream>;