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

[eriktorbjorn at users.sourceforge.net]

Revision: 49919
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49919&view=rev
Author:   eriktorbjorn
Date:     2010-06-17 05:40:48 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Fixed a few cppcheck errors.

Modified Paths:
--------------
    scummvm/trunk/engines/groovie/font.cpp
    scummvm/trunk/engines/m4/mads_scene.cpp
    scummvm/trunk/graphics/video/qt_decoder.cpp

Modified: scummvm/trunk/engines/groovie/font.cpp
===================================================================
--- scummvm/trunk/engines/groovie/font.cpp	2010-06-17 03:57:38 UTC (rev 49918)
+++ scummvm/trunk/engines/groovie/font.cpp	2010-06-17 05:40:48 UTC (rev 49919)
@@ -54,6 +54,7 @@
 
 	if (stream.eos()) {
 		error("Groovie::T7GFont: Couldn't read the glyph offsets");
+		delete[] glyphOffsets;
 		return false;
 	}
 

Modified: scummvm/trunk/engines/m4/mads_scene.cpp
===================================================================
--- scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-17 03:57:38 UTC (rev 49918)
+++ scummvm/trunk/engines/m4/mads_scene.cpp	2010-06-17 05:40:48 UTC (rev 49919)
@@ -635,7 +635,7 @@
 	if (sceneNumber > 0) {
 		sceneName = MADSResourceManager::getResourceName(RESPREFIX_RM, sceneNumber, ".DAT");
 	} else {
-		strcat(buffer1, "*");
+		strcpy(buffer1, "*");
 		strcat(buffer1, resName);
 		sceneName = buffer1; // TODO: Check whether this needs to be converted to 'HAG form'
 	}

Modified: scummvm/trunk/graphics/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/graphics/video/qt_decoder.cpp	2010-06-17 03:57:38 UTC (rev 49918)
+++ scummvm/trunk/graphics/video/qt_decoder.cpp	2010-06-17 05:40:48 UTC (rev 49919)
@@ -536,6 +536,8 @@
 	unsigned long dstLen = uncompressedSize;
 	if (!Common::uncompress(uncompressedData, &dstLen, compressedData, compressedSize)) {
 		warning ("Could not uncompress cmov chunk");
+		free(compressedData);
+		free(uncompressedData);
 		return -1;
 	}
 


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