zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-02-23 12:21:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

avoid memory leak in new_fluid_voice()

Browse source
This commit is contained in:
derselbst 2018-04-11 19:33:40 +02:00
parent 78de299da4
commit ff19788fda
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/synth/fluid_voice.c
View file

@ -218,12 +218,15 @@ new_fluid_voice(fluid_rvoice_eventhandler_t* handler, fluid_real_t output_rate)
FLUID_LOG(FLUID_ERR, "Out of memory"); FLUID_LOG(FLUID_ERR, "Out of memory");
return NULL; return NULL;
} }
voice->can_access_rvoice = TRUE;
voice->can_access_overflow_rvoice = TRUE;
voice->rvoice = FLUID_NEW(fluid_rvoice_t); voice->rvoice = FLUID_NEW(fluid_rvoice_t);
voice->overflow_rvoice = FLUID_NEW(fluid_rvoice_t); voice->overflow_rvoice = FLUID_NEW(fluid_rvoice_t);
if (voice->rvoice == NULL || voice->overflow_rvoice == NULL) { if (voice->rvoice == NULL || voice->overflow_rvoice == NULL) {
FLUID_LOG(FLUID_ERR, "Out of memory"); FLUID_LOG(FLUID_ERR, "Out of memory");
FLUID_FREE(voice->rvoice); delete_fluid_voice(voice);
FLUID_FREE(voice);
return NULL; return NULL;
} }
@ -237,8 +240,6 @@ new_fluid_voice(fluid_rvoice_eventhandler_t* handler, fluid_real_t output_rate)
voice->output_rate = output_rate; voice->output_rate = output_rate;
/* Initialize both the rvoice and overflow_rvoice */ /* Initialize both the rvoice and overflow_rvoice */
voice->can_access_rvoice = TRUE;
voice->can_access_overflow_rvoice = TRUE;
fluid_voice_initialize_rvoice(voice, output_rate); fluid_voice_initialize_rvoice(voice, output_rate);
fluid_voice_swap_rvoice(voice); fluid_voice_swap_rvoice(voice);
fluid_voice_initialize_rvoice(voice, output_rate); fluid_voice_initialize_rvoice(voice, output_rate);