[Scummvm-cvs-logs] SF.net SVN: scummvm:[53509] scummvm/trunk/engines/sword2/resman.cpp

[eriktorbjorn at users.sourceforge.net]

Revision: 53509
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53509&view=rev
Author:   eriktorbjorn
Date:     2010-10-15 19:08:56 +0000 (Fri, 15 Oct 2010)

Log Message:
-----------
SWORD2: Add assert()s prompted by code analysis warnings.

See bug #3087857.

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

Modified: scummvm/trunk/engines/sword2/resman.cpp
===================================================================
--- scummvm/trunk/engines/sword2/resman.cpp	2010-10-15 18:30:29 UTC (rev 53508)
+++ scummvm/trunk/engines/sword2/resman.cpp	2010-10-15 19:08:56 UTC (rev 53509)
@@ -302,6 +302,8 @@
 			readCluIndex(cluFileNum, file);
 		}
 
+		assert(_resFiles[cluFileNum].entryTab);
+
 		uint32 pos = _resFiles[cluFileNum].entryTab[actual_res * 2 + 0];
 		uint32 len = _resFiles[cluFileNum].entryTab[actual_res * 2 + 1];
 
@@ -476,6 +478,9 @@
 	assert((tableSize % 8) == 0);
 	_resFiles[fileNum].entryTab = (uint32 *)malloc(tableSize);
 	_resFiles[fileNum].numEntries = tableSize / 8;
+
+	assert(_resFiles[fileNum].entryTab);
+
 	file->read(_resFiles[fileNum].entryTab, tableSize);
 	if (file->eos() || file->err())
 		error("unable to read index table from file %s", _resFiles[fileNum].fileName);


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