Mixer: Add assertions regarding num_samples versus buffer length #11011
+20
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Pokechu22
force-pushed
the
audio-mixer-assertions
branch
from
14de711
to
e639cc2
Compare
Source/Core/AudioCommon/Mixer.cpp
Outdated
| static constexpr u32 MAX_SPEAKER_SAMPLES = 20 * 2; | ||
| std::array<short, MAX_SPEAKER_SAMPLES * 2> samples_stereo; | ||
|
|
||
| ASSERT_MSG(AUDIO, num_samples < MAX_SPEAKER_SAMPLES, |
There was a problem hiding this comment.
This needs to be num_samples <= MAX_SPEAKER_SAMPLES... Actually I think this applies to all of the asserts as well as the if a few lines down.
Pokechu22
force-pushed
the
audio-mixer-assertions
branch
from
e639cc2
to
72de74d
Compare
|
Seems good, let's see if anything or anyone triggers these. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Compare #10664. I haven't been able to reproduce any buffer overflows (other than the audio dumping one from #10741), but hopefully these assertions will make them more obvious when they happen.
(I didn't add any assertions to
Mixer::MixerFifo::PushSamplesbecause that code should already be free of overflows due to the masking.)