[gentoo-commits] gentoo-x86 commit in media-libs/sdl-mixer/files: sdl-mixer-1.2.12-wav.patch

[Michael Sterrett (mr_bones_)]

mr_bones_    12/03/04 05:51:05

  Added:                sdl-mixer-1.2.12-wav.patch
  Log:
  add upstream patch for failure to load wav situation (bug #406739)
  
  (Portage version: 2.1.10.44/cvs/Linux i686)

Revision  Changes    Path
1.1                  media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/sdl-mixer/files/sdl-mixer-1.2.12-wav.patch?rev=1.1&content-type=text/plain

Index: sdl-mixer-1.2.12-wav.patch
===================================================================
https://bugs.gentoo.org/show_bug.cgi?id=406739
Nikos Chantziaras 2012-03-03 03:13:39 EST

There's a bug in the current version of SDL_mixer where failing to load a WAV sample will result in freeing a resource twice, resulting in an application crash.  There is an upstream fix for this:

http://hg.libsdl.org/SDL_mixer/rev/ea53a85853dd

Upstream bug: http://bugzilla.libsdl.org/show_bug.cgi?id=1418

--- a/mixer.c
+++ b/mixer.c
@@ -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);
 	}