[Scummvm-cvs-logs] SF.net SVN: scummvm:[48162] scummvm/trunk/engines/scumm/imuse_digi

[lordhoto at users.sourceforge.net]

Revision: 48162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48162&view=rev
Author:   lordhoto
Date:     2010-03-04 17:46:18 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
Fix another mismatching new[] call (note that this needs to be replaced by malloc, since else MemoryReadStream will try to use free on an new[] allocated block.)

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
    scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2010-03-04 17:24:47 UTC (rev 48161)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_bndmgr.cpp	2010-03-04 17:46:18 UTC (rev 48162)
@@ -281,7 +281,7 @@
 		lastBlock = _numCompItems - 1;
 
 	int32 blocksFinalSize = 0x2000 * (1 + lastBlock - firstBlock);
-	*compFinal = new byte[blocksFinalSize];
+	*compFinal = (byte *)malloc(blocksFinalSize);
 	assert(*compFinal);
 	finalSize = 0;
 

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2010-03-04 17:24:47 UTC (rev 48161)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2010-03-04 17:46:18 UTC (rev 48162)
@@ -464,7 +464,7 @@
 	sound->disk = _disk;
 	prepareSound(ptr, sound);
 	if ((soundType == IMUSE_BUNDLE) && !sound->compressed) {
-		delete[] ptr;
+		free(ptr);
 	}
 	return sound;
 }


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