[Scummvm-cvs-logs] scummvm master -> 2d50ec1f3449b1fcab0c4795bef3ff8414f0d03c

[lordhoto]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5b1557adbf KYRA: Properly check for empty rects in wsaFrameAnimationStep.
af3059c114 KYRA: Properly check parameters in CharacterGenerator::start.
2d50ec1f34 KYRA: Plug memory leak in SoundTowns::playSoundEffect.


Commit: 5b1557adbf3525256de2fbc1daa92ac69ffc9410
    https://github.com/scummvm/scummvm/commit/5b1557adbf3525256de2fbc1daa92ac69ffc9410
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-10T03:49:58-08:00

Commit Message:
KYRA: Properly check for empty rects in wsaFrameAnimationStep.

Discovered by covertiy (CID #1003839).

Changed paths:
    engines/kyra/screen_v2.cpp



diff --git a/engines/kyra/screen_v2.cpp b/engines/kyra/screen_v2.cpp
index cc7d526..23eb94c 100644
--- a/engines/kyra/screen_v2.cpp
+++ b/engines/kyra/screen_v2.cpp
@@ -280,7 +280,7 @@ void Screen_v2::setTextColorMap(const uint8 *cmap) {
 void Screen_v2::wsaFrameAnimationStep(int x1, int y1, int x2, int y2,
                                       int w1, int h1, int w2, int h2, int srcPage, int dstPage, int dim) {
 
-	if (!(w1 || h1 || w2 || h2))
+	if (!w1 || !h1 || !w2 || !h2)
 		return;
 
 	ScreenDim cdm = *getScreenDim(dim);


Commit: af3059c114303950db592f75e38f0f83b0048b8a
    https://github.com/scummvm/scummvm/commit/af3059c114303950db592f75e38f0f83b0048b8a
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-10T03:58:05-08:00

Commit Message:
KYRA: Properly check parameters in CharacterGenerator::start.

Discoverd by CID #1003816.

Changed paths:
    engines/kyra/chargen.cpp



diff --git a/engines/kyra/chargen.cpp b/engines/kyra/chargen.cpp
index 80a95da..80ff42e 100644
--- a/engines/kyra/chargen.cpp
+++ b/engines/kyra/chargen.cpp
@@ -155,8 +155,10 @@ CharacterGenerator::~CharacterGenerator() {
 }
 
 bool CharacterGenerator::start(EoBCharacter *characters, uint8 ***faceShapes) {
-	if (!characters && !faceShapes)
+	if (!characters || !faceShapes) {
+		warning("CharacterGenerator::start: Called without character data");
 		return true;
+	}
 
 	_characters = characters;
 	_faceShapes = *faceShapes;


Commit: 2d50ec1f3449b1fcab0c4795bef3ff8414f0d03c
    https://github.com/scummvm/scummvm/commit/2d50ec1f3449b1fcab0c4795bef3ff8414f0d03c
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-11-10T04:19:28-08:00

Commit Message:
KYRA: Plug memory leak in SoundTowns::playSoundEffect.

Discovered by CID #1003909.

Changed paths:
    engines/kyra/sound_towns.cpp



diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index af741a1..e4752f3 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -225,6 +225,7 @@ void SoundTowns::playSoundEffect(uint8 track, uint8) {
 	_driver->chanPanPos(_sfxChannel, 0x40);
 	_driver->chanPitch(_sfxChannel, 0);
 	_driver->playSoundEffect(_sfxChannel, note, 127, sfxPlaybackBuffer);
+	delete[] sfxPlaybackBuffer;
 }
 
 void SoundTowns::updateVolumeSettings() {