[Scummvm-cvs-logs] SF.net SVN: scummvm:[51373] scummvm/trunk/sound/decoders/aiff.cpp

[mthreepwood at users.sourceforge.net]

Revision: 51373
          http://scummvm.svn.sourceforge.net/scummvm/?rev=51373&view=rev
Author:   mthreepwood
Date:     2010-07-27 14:51:36 +0000 (Tue, 27 Jul 2010)

Log Message:
-----------
SOUND: Only dispose the input stream in makeAIFFStream if requested

Modified Paths:
--------------
    scummvm/trunk/sound/decoders/aiff.cpp

Modified: scummvm/trunk/sound/decoders/aiff.cpp
===================================================================
--- scummvm/trunk/sound/decoders/aiff.cpp	2010-07-27 14:51:08 UTC (rev 51372)
+++ scummvm/trunk/sound/decoders/aiff.cpp	2010-07-27 14:51:36 UTC (rev 51373)
@@ -175,8 +175,10 @@
 	data = (byte *)malloc(size);
 	assert(data);
 	stream->read(data, size);
-	delete stream;
 
+	if (disposeAfterUse == DisposeAfterUse::YES)
+		delete stream;
+
 	// Since we allocated our own buffer for the data, we must specify DisposeAfterUse::YES.
 	return makeRawStream(data, size, rate, flags);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.