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

[eriktorbjorn at users.sourceforge.net]

Revision: 45391
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45391&view=rev
Author:   eriktorbjorn
Date:     2009-10-26 06:20:13 +0000 (Mon, 26 Oct 2009)

Log Message:
-----------
Fixed some cppcheck warnings.

Modified Paths:
--------------
    scummvm/trunk/engines/sci/seq_decoder.cpp
    scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp

Modified: scummvm/trunk/engines/sci/seq_decoder.cpp
===================================================================
--- scummvm/trunk/engines/sci/seq_decoder.cpp	2009-10-26 05:19:43 UTC (rev 45390)
+++ scummvm/trunk/engines/sci/seq_decoder.cpp	2009-10-26 06:20:13 UTC (rev 45391)
@@ -91,7 +91,7 @@
 
 	g_system->setPalette(palette, 0, 256);
 
-	delete paletteData;
+	delete[] paletteData;
 
 	_videoInfo.firstframeOffset = _fileStream->pos();
 
@@ -144,7 +144,7 @@
 		byte *buf = new byte[frameSize];
 		_fileStream->read(buf, frameSize);
 		decodeFrame(buf, rleSize, buf + rleSize, frameSize - rleSize, _videoFrameBuffer + 320 * frameTop, frameLeft, frameWidth, frameHeight, colorKey);
-		delete buf;
+		delete[] buf;
 	}
 
 	return ++_videoInfo.currentFrame < _videoInfo.frameCount;

Modified: scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp	2009-10-26 05:19:43 UTC (rev 45390)
+++ scummvm/trunk/engines/sci/sfx/softseq/amiga.cpp	2009-10-26 06:20:13 UTC (rev 45391)
@@ -413,6 +413,8 @@
 	instrument->samples = (int8 *) malloc(size + 1);
 	if (file.read(instrument->samples, size) < (unsigned int)size) {
 		warning("[sfx:seq:amiga] failed to read instrument samples");
+		free(instrument->samples);
+		free(instrument);
 		return NULL;
 	}
 
@@ -427,6 +429,8 @@
 
 		if (seg_size[1] < 0) {
 			warning("[sfx:seq:amiga] invalid looping point");
+			free(instrument->samples);
+			free(instrument);
 			return NULL;
 		}
 


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