timidity: fix potential memory leak in Timidity_LoadSong()

libsdl-org · Oct 20, 2018 · 78824ea · 78824ea
1 parent e06c846
commit 78824ea
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/timidity/timidity.c b/timidity/timidity.c
@@ -459,9 +459,11 @@ MidiSong *Timidity_LoadSong(SDL_RWops *rw, SDL_AudioSpec *audio)
 
   if (rw == NULL)
       return NULL;
-  
+
   /* Allocate memory for the song */
   song = (MidiSong *)safe_malloc(sizeof(*song));
+  if (song == NULL)
+      return NULL;
   memset(song, 0, sizeof(*song));
 
   for (i = 0; i < MAXBANK; i++)
@@ -498,6 +500,7 @@ MidiSong *Timidity_LoadSong(SDL_RWops *rw, SDL_AudioSpec *audio)
       song->encoding |= PE_MONO;
   else if (audio->channels > 2) {
       SDL_SetError("Surround sound not supported");
+      free(song);
       return NULL;
   }
   switch (audio->format) {
@@ -530,7 +533,8 @@ MidiSong *Timidity_LoadSong(SDL_RWops *rw, SDL_AudioSpec *audio)
 	  break;
   default:
 	  SDL_SetError("Unsupported audio format");
-      return NULL;
+	  free(song);
+	  return NULL;
   }
 
   song->buffer_size = audio->samples;