[Commits] SDL_mixer: Fixed 1418 - crash on double free if loading WAV file...

[libsdl.org revision control]

details:   http://hg.libsdl.org/SDL_mixer/rev/2d713670db9b
changeset: 583:2d713670db9b
user:      Sam Lantinga <slouken at libsdl.org>
date:      Sun Feb 12 17:57:17 2012 -0500
description:
Fixed 1418 - crash on double free if loading WAV file failed

diffstat:

 mixer.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r df72f22b4b41 -r 2d713670db9b mixer.c
--- a/mixer.c	Mon Jan 30 21:41:45 2012 -0500
+++ b/mixer.c	Sun Feb 12 17:57:17 2012 -0500
@@ -610,13 +610,15 @@
 			break;
 		default:
 			SDL_SetError("Unrecognized sound file type");
-			return(0);			
+			if ( freesrc ) {
+				SDL_RWclose(src);
+			}
+			loaded = NULL;
+			break;
 	}
 	if ( !loaded ) {
+		/* The individual loaders have closed src if needed */
 		SDL_free(chunk);
-		if ( freesrc ) {
-			SDL_RWclose(src);
-		}
 		return(NULL);
 	}