[Scummvm-cvs-logs] scummvm master -> f8593e8ecb9b0fbe01893eb8bf086805edfd65a0

[sev-]

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

Summary:
b47c50a703 AGI: Null terminate string. CID 1003888
4e7a117cd2 AGI: Null terminate string. CID 1003889
9d087cb314 AGI: Null terminate string. CID 1003890
f8593e8ecb GROOVOE: Plug memory leak. CID 1003912


Commit: b47c50a703aabace27eb47317c5f3424e3b4c22d
    https://github.com/scummvm/scummvm/commit/b47c50a703aabace27eb47317c5f3424e3b4c22d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-26T22:43:06-07:00

Commit Message:
AGI: Null terminate string. CID 1003888

Changed paths:
    engines/agi/op_cmd.cpp



diff --git a/engines/agi/op_cmd.cpp b/engines/agi/op_cmd.cpp
index 0245f39..2366d97 100644
--- a/engines/agi/op_cmd.cpp
+++ b/engines/agi/op_cmd.cpp
@@ -1219,7 +1219,7 @@ void cmdWander(AgiGame *state, uint8 *p) {
 
 void cmdSetGameID(AgiGame *state, uint8 *p) {
 	if (state->_curLogic->texts && (p0 - 1) <= state->_curLogic->numTexts)
-		strncpy(state->id, state->_curLogic->texts[p0 - 1], 8);
+		Common::strlcpy(state->id, state->_curLogic->texts[p0 - 1], 8);
 	else
 		state->id[0] = 0;
 


Commit: 4e7a117cd28900bfdd5326115cd6e568394fb145
    https://github.com/scummvm/scummvm/commit/4e7a117cd28900bfdd5326115cd6e568394fb145
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-26T22:44:20-07:00

Commit Message:
AGI: Null terminate string. CID 1003889

Changed paths:
    engines/agi/saveload.cpp



diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index d451a79..ea102bf 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -316,7 +316,7 @@ int AgiEngine::loadGame(const Common::String &fileName, bool checkId) {
 		return errBadFileOpen;
 	}
 
-	strncpy(_game.id, loadId, 8);
+	Common::strlcpy(_game.id, loadId, 8);
 
 	if (saveVersion >= 5) {
 		char md5[32 + 1];


Commit: 9d087cb314490246a21a4e0ef57b1b126e3e3ad4
    https://github.com/scummvm/scummvm/commit/9d087cb314490246a21a4e0ef57b1b126e3e3ad4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-26T22:46:24-07:00

Commit Message:
AGI: Null terminate string. CID 1003890

Changed paths:
    engines/agi/saveload.cpp



diff --git a/engines/agi/saveload.cpp b/engines/agi/saveload.cpp
index ea102bf..c449f07 100644
--- a/engines/agi/saveload.cpp
+++ b/engines/agi/saveload.cpp
@@ -678,7 +678,7 @@ int AgiEngine::selectSlot() {
 			switch (key) {
 			case KEY_ENTER:
 				rc = active;
-				strncpy(_game.strings[MAX_STRINGS], desc[i], MAX_STRINGLEN);
+				Common::strlcpy(_game.strings[MAX_STRINGS], desc[i], MAX_STRINGLEN);
 				debugC(8, kDebugLevelMain | kDebugLevelInput, "Button pressed: %d", rc);
 				exitSelectSlot = true;
 				break;


Commit: f8593e8ecb9b0fbe01893eb8bf086805edfd65a0
    https://github.com/scummvm/scummvm/commit/f8593e8ecb9b0fbe01893eb8bf086805edfd65a0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2013-04-26T22:49:07-07:00

Commit Message:
GROOVOE: Plug memory leak. CID 1003912

Changed paths:
    engines/groovie/cursor.cpp



diff --git a/engines/groovie/cursor.cpp b/engines/groovie/cursor.cpp
index 6422570..cac78a9 100644
--- a/engines/groovie/cursor.cpp
+++ b/engines/groovie/cursor.cpp
@@ -378,8 +378,7 @@ void Cursor_v2::decodeFrame(byte *pal, byte *data, byte *dest) {
 		}
 	}
 
-
-
+	delete[] tmp;
 }
 
 void Cursor_v2::enable() {