[Scummvm-cvs-logs] SF.net SVN: scummvm:[44512] scummvm/trunk/engines

[wjpalenstijn at users.sourceforge.net]

Revision: 44512
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44512&view=rev
Author:   wjpalenstijn
Date:     2009-10-01 11:02:23 +0000 (Thu, 01 Oct 2009)

Log Message:
-----------
Fix free/delete/delete[] mismatches. Patch by salty-horse

Modified Paths:
--------------
    scummvm/trunk/engines/sword1/control.cpp
    scummvm/trunk/engines/sword2/resman.cpp

Modified: scummvm/trunk/engines/sword1/control.cpp
===================================================================
--- scummvm/trunk/engines/sword1/control.cpp	2009-10-01 10:57:59 UTC (rev 44511)
+++ scummvm/trunk/engines/sword1/control.cpp	2009-10-01 11:02:23 UTC (rev 44512)
@@ -1268,7 +1268,7 @@
 	if (!newSave) {
 		// Display a warning message and do nothing
 		warning("Unable to create file '%s'. (%s)", newFileName, _saveFileMan->popErrorDesc().c_str());
-		free(saveData);
+		delete[] saveData;
 		saveData = NULL;
 		return false;
 	}
@@ -1299,7 +1299,7 @@
 	_saveFileMan->removeSavefile(oldFileName);
 
 	// Cleanup
-	free(saveData);
+	delete[] saveData;
 	saveData = NULL;
 	return true;
 }

Modified: scummvm/trunk/engines/sword2/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword2/resman.cpp	2009-10-01 10:57:59 UTC (rev 44511)
+++ scummvm/trunk/engines/sword2/resman.cpp	2009-10-01 11:02:23 UTC (rev 44512)
@@ -179,7 +179,7 @@
 			cdInf[i].cd = file.readByte();
 
 			if (file.eos() || file.err()) {
-				delete cdInf;
+				delete[] cdInf;
 				file.close();
 				GUIErrorMessage("Broken Sword 2: Cannot read cd.inf");
 				return false;


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