mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 21:32:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Audio Mixer) Pad sample buffers to prevent potential heap-buffer-overflows when resampling (fixes crash when using 30 kHz menu audio files) (#12987)

Browse Source
This commit is contained in:
jdgleaver 2021-09-15 00:17:45 +01:00 committed by GitHub
parent 868a4bf3fc
commit 516dcb34d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libretro-common/audio/audio_mixer.c
View File

@ -279,17 +279,15 @@ static bool one_shot_resample(const float* in, size_t samples_in,
resampler_ident, quality, ratio)) resampler_ident, quality, ratio))
return false; return false;
/* /* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* add four more samples in the formula below just as safeguard, because * add four more samples in the formula below just as safeguard, because
* resampler->process sometimes reports more output samples than the * resampler->process sometimes reports more output samples than the
* formula below calculates. Ideally, audio resamplers should have a * formula below calculates. Ideally, audio resamplers should have a
* function to return the number of samples they will output given a * function to return the number of samples they will output given a
* count of input samples. * count of input samples. */
*/ *samples_out = (size_t)(samples_in * ratio);
*samples_out = samples_in * ratio + 4;
*out = (float*)memalign_alloc(16, *out = (float*)memalign_alloc(16,
((*samples_out + 15) & ~15) * sizeof(float)); (((*samples_out + 4) + 15) & ~15) * sizeof(float));
if (*out == NULL) if (*out == NULL)
return false; return false;
@ -547,9 +545,15 @@ static bool audio_mixer_play_ogg(
goto error; goto error;
} }
/* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* add four more samples in the formula below just as safeguard, because
* resampler->process sometimes reports more output samples than the
* formula below calculates. Ideally, audio resamplers should have a
* function to return the number of samples they will output given a
* count of input samples. */
samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio); samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio);
ogg_buffer = (float*)memalign_alloc(16, ogg_buffer = (float*)memalign_alloc(16,
((samples + 15) & ~15) * sizeof(float)); (((samples + 4) + 15) & ~15) * sizeof(float));
if (!ogg_buffer) if (!ogg_buffer)
{ {
@ -690,9 +694,15 @@ static bool audio_mixer_play_flac(
goto error; goto error;
} }
/* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* add four more samples in the formula below just as safeguard, because
* resampler->process sometimes reports more output samples than the
* formula below calculates. Ideally, audio resamplers should have a
* function to return the number of samples they will output given a
* count of input samples. */
samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio); samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio);
flac_buffer = (float*)memalign_alloc(16, flac_buffer = (float*)memalign_alloc(16,
((samples + 15) & ~15) * sizeof(float)); (((samples + 4) + 15) & ~15) * sizeof(float));
if (!flac_buffer) if (!flac_buffer)
{ {
@ -762,9 +772,15 @@ static bool audio_mixer_play_mp3(
goto error; goto error;
} }
/* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
* add four more samples in the formula below just as safeguard, because
* resampler->process sometimes reports more output samples than the
* formula below calculates. Ideally, audio resamplers should have a
* function to return the number of samples they will output given a
* count of input samples. */
samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio); samples = (unsigned)(AUDIO_MIXER_TEMP_BUFFER * ratio);
mp3_buffer = (float*)memalign_alloc(16, mp3_buffer = (float*)memalign_alloc(16,
((samples + 15) & ~15) * sizeof(float)); (((samples + 4) + 15) & ~15) * sizeof(float));
if (!mp3_buffer) if (!mp3_buffer)
{ {