zdoom
/
fluidsynth
mirror of https://github.com/ZDoom/fluidsynth.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add a safety check in case CoreAudio provides more buffers than were allocated.

This commit is contained in:
Matt Taylor 2022-04-15 15:13:07 -06:00
parent 326d90e952
commit 7e081d700b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/drivers/fluid_coreaudio.c
View File

@ -52,6 +52,7 @@ typedef struct
fluid_audio_func_t callback;
void *data;
unsigned int buffer_size;
unsigned int buffer_count;
float **buffers;
double phase;
} fluid_core_audio_driver_t;
@ -435,6 +436,8 @@ new_fluid_core_audio_driver2(fluid_settings_t *settings, fluid_audio_func_t func
goto error_recovery;
}
dev->buffer_count = (unsigned int) audio_channels;
// Initialize the audio unit
status = AudioUnitInitialize(dev->outputUnit);
@ -497,7 +500,7 @@ fluid_core_audio_callback(void *data,
UInt32 i, nBuffers = ioData->mNumberBuffers;
fluid_audio_func_t callback = (dev->callback != NULL) ? dev->callback : (fluid_audio_func_t) fluid_synth_process;
for(i = 0; i < ioData->mNumberBuffers; i++)
for(i = 0; i < ioData->mNumberBuffers && i < dev->buffer_count; i++)
{
dev->buffers[i] = ioData->mBuffers[i].mData;
FLUID_MEMSET(dev->buffers[i], 0, len * sizeof(float));