aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorbjörn Andersson2010-06-17 05:40:48 +0000
committerTorbjörn Andersson2010-06-17 05:40:48 +0000
commitf10b1a23f807d7889a2776ce80ea8b7a77160eb5 (patch)
tree532d03db6fb7108db69e9d8450ba13c367a960b4
parent39276e82dbebf55e68ecc298cbeef01133fb0bf8 (diff)
downloadscummvm-rg350-f10b1a23f807d7889a2776ce80ea8b7a77160eb5.tar.gz
scummvm-rg350-f10b1a23f807d7889a2776ce80ea8b7a77160eb5.tar.bz2
scummvm-rg350-f10b1a23f807d7889a2776ce80ea8b7a77160eb5.zip
Fixed a few cppcheck errors.
svn-id: r49919
-rw-r--r--engines/groovie/font.cpp1
-rw-r--r--engines/m4/mads_scene.cpp2
-rw-r--r--graphics/video/qt_decoder.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/engines/groovie/font.cpp b/engines/groovie/font.cpp
index 6aa6c89d31..dc1d7ae73a 100644
--- a/engines/groovie/font.cpp
+++ b/engines/groovie/font.cpp
@@ -54,6 +54,7 @@ bool T7GFont::load(Common::SeekableReadStream &stream) {
if (stream.eos()) {
error("Groovie::T7GFont: Couldn't read the glyph offsets");
+ delete[] glyphOffsets;
return false;
}
diff --git a/engines/m4/mads_scene.cpp b/engines/m4/mads_scene.cpp
index 428b92c657..43b39af0db 100644
--- a/engines/m4/mads_scene.cpp
+++ b/engines/m4/mads_scene.cpp
@@ -635,7 +635,7 @@ void MadsSceneResources::load(int sceneNumber, const char *resName, int v0, M4Su
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'
}
diff --git a/graphics/video/qt_decoder.cpp b/graphics/video/qt_decoder.cpp
index 842c38f315..a95243ba6a 100644
--- a/graphics/video/qt_decoder.cpp
+++ b/graphics/video/qt_decoder.cpp
@@ -536,6 +536,8 @@ int QuickTimeDecoder::readCMOV(MOVatom atom) {
unsigned long dstLen = uncompressedSize;
if (!Common::uncompress(uncompressedData, &dstLen, compressedData, compressedSize)) {
warning ("Could not uncompress cmov chunk");
+ free(compressedData);
+ free(uncompressedData);
return -1;
}