[Scummvm-cvs-logs] scummvm master -> 1c841094fa68af4b2797d3f06d7ffbcffb8ac85a

eriktorbjorn eriktorbjorn at telia.com
Mon Nov 30 22:42:05 CET 2015


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

Summary:
93b2a2e5c6 TIMIDITY: Fix resource leak (CID 1003919)
1c841094fa BBVS: Use memmove(), not memcpy(), for overlapping memory areas


Commit: 93b2a2e5c65de34029bc1b8bde18f2c98cb8e4b7
    https://github.com/scummvm/scummvm/commit/93b2a2e5c65de34029bc1b8bde18f2c98cb8e4b7
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-11-30T22:21:35+01:00

Commit Message:
TIMIDITY: Fix resource leak (CID 1003919)

Changed paths:
    backends/midi/timidity.cpp



diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index d10b808..4971388 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -316,6 +316,7 @@ int MidiDriver_TIMIDITY::connect_to_server(const char* hostname, unsigned short
 
 	if (connect(fd, (struct sockaddr *)&in, sizeof(in)) < 0) {
 		warning("TiMidity: connect(): %s", strerror(errno));
+		::close(fd);
 		return -1;
 	}
 


Commit: 1c841094fa68af4b2797d3f06d7ffbcffb8ac85a
    https://github.com/scummvm/scummvm/commit/1c841094fa68af4b2797d3f06d7ffbcffb8ac85a
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-11-30T22:39:54+01:00

Commit Message:
BBVS: Use memmove(), not memcpy(), for overlapping memory areas

CID 1230310. This fixes the credits easter eggs for me.

Changed paths:
    engines/bbvs/bbvs.cpp



diff --git a/engines/bbvs/bbvs.cpp b/engines/bbvs/bbvs.cpp
index 1d668f9..816b713 100644
--- a/engines/bbvs/bbvs.cpp
+++ b/engines/bbvs/bbvs.cpp
@@ -1384,7 +1384,7 @@ void BbvsEngine::checkEasterEgg(char key) {
 	};
 
 	if (_currSceneNum == kCredits) {
-		memcpy(&_easterEggInput[1], &_easterEggInput[0], 6);
+		memmove(&_easterEggInput[1], &_easterEggInput[0], 6);
 		_easterEggInput[0] = key;
 		for (int i = 0; i < ARRAYSIZE(kEasterEggStrings); ++i) {
 			if (!scumm_strnicmp(kEasterEggStrings[i], _easterEggInput, kEasterEggLengths[i])) {






More information about the Scummvm-git-logs mailing list