[Scummvm-cvs-logs] CVS: scummvm/sound wave.cpp,1.14,1.15

[kirben]

Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15527/sound

Modified Files:
	wave.cpp 
Log Message:

Fix memory leak, if called directly.


Index: wave.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/wave.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- wave.cpp	18 Jan 2006 17:39:52 -0000	1.14
+++ wave.cpp	27 Jan 2006 00:10:18 -0000	1.15
@@ -110,7 +110,7 @@
 	// Prepare the return values.
 	rate = samplesPerSec;
 
-	flags = 0;
+	flags = Audio::Mixer::FLAG_AUTOFREE;
 	if (bitsPerSample == 8)		// 8 bit data is unsigned
 		flags |= Audio::Mixer::FLAG_UNSIGNED;
 	else if (bitsPerSample == 16)	// 16 bit data is signed little endian
@@ -169,7 +169,6 @@
 	byte *data = (byte *)malloc(size);
 	assert(data);
 	stream.read(data, size);
-	flags |= Audio::Mixer::FLAG_AUTOFREE;
 
 	return makeLinearInputStream(rate, flags, data, size, 0, 0);
 }