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

[aquadran at users.sourceforge.net]

Revision: 30561
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30561&view=rev
Author:   aquadran
Date:     2008-01-19 03:14:28 -0800 (Sat, 19 Jan 2008)

Log Message:
-----------
malloc -> new, free -> delete, added few asserts

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

Modified: scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp
===================================================================
--- scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2008-01-19 10:58:43 UTC (rev 30560)
+++ scummvm/trunk/engines/scumm/imuse_digi/dimuse_sndmgr.cpp	2008-01-19 11:14:28 UTC (rev 30561)
@@ -139,7 +139,7 @@
 	}
 	for (l = 0; l < sound->numSyncs; l++) {
 		sound->sync[l].size = file->readUint32BE();
-		sound->sync[l].ptr = (byte *)malloc(sound->sync[l].size);
+		sound->sync[l].ptr = new byte[sound->sync[l].size];
 		file->read(sound->sync[l].ptr, sound->sync[l].size);
 	}
 	if (version >= 3) {
@@ -261,6 +261,7 @@
 					sound->marker[curIndexMarker].pos = READ_BE_UINT32(ptr + 4);
 					sound->marker[curIndexMarker].length = strlen((const char *)(ptr + 8)) + 1;
 					sound->marker[curIndexMarker].ptr = new char[sound->marker[curIndexMarker].length];
+					assert(sound->marker[curIndexMarker].ptr);
 					strcpy(sound->marker[curIndexMarker].ptr, (const char *)(ptr + 8));
 					curIndexMarker++;
 				}
@@ -286,7 +287,8 @@
 			case MKID_BE('SYNC'):
 				size = READ_BE_UINT32(ptr); ptr += 4;
 				sound->sync[curIndexSync].size = size;
-				sound->sync[curIndexSync].ptr = (byte *)malloc(size);
+				sound->sync[curIndexSync].ptr = new byte[size];
+				assert(sound->sync[curIndexSync].ptr);
 				memcpy(sound->sync[curIndexSync].ptr, ptr, size);
 				curIndexSync++;
 				ptr += size;
@@ -484,7 +486,7 @@
 	delete soundDesc->bundle;
 
 	for (int r = 0; r < soundDesc->numSyncs; r++)
-		free(soundDesc->sync[r].ptr);
+		delete[] soundDesc->sync[r].ptr;
 	for (int r = 0; r < soundDesc->numMarkers; r++)
 		delete[] soundDesc->marker[r].ptr;
 	delete[] soundDesc->region;


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