[Scummvm-cvs-logs] scummvm master -> 23bc6bb8462f995b1987612b225b5731a85e913e

sev- sev at scummvm.org
Mon Feb 22 18:46:29 CET 2016


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:
dd6119bdad WAGE: Fix buffer overrun
23bc6bb846 WAGE: Initialize class variables


Commit: dd6119bdad9f7b7d1c9224d70bc44221826eb0b3
    https://github.com/scummvm/scummvm/commit/dd6119bdad9f7b7d1c9224d70bc44221826eb0b3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-22T18:45:58+01:00

Commit Message:
WAGE: Fix buffer overrun

Changed paths:
    engines/wage/world.cpp



diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 73abebc..1ef2ea4 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -509,8 +509,8 @@ const char *World::getAboutMenuItemName() {
 		const char *pos = strchr(str, '@');
 		if (pos) {
 			strncat(menu, str, (pos - str));
-			strncat(menu, _name.c_str(), 256);
-			strncat(menu, pos + 1, 256);
+			strncat(menu, _name.c_str(), 255);
+			strncat(menu, pos + 1, 255);
 		}
 	}
 


Commit: 23bc6bb8462f995b1987612b225b5731a85e913e
    https://github.com/scummvm/scummvm/commit/23bc6bb8462f995b1987612b225b5731a85e913e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-02-22T18:45:58+01:00

Commit Message:
WAGE: Initialize class variables

Changed paths:
    engines/wage/world.cpp



diff --git a/engines/wage/world.cpp b/engines/wage/world.cpp
index 1ef2ea4..40b1555 100644
--- a/engines/wage/world.cpp
+++ b/engines/wage/world.cpp
@@ -67,6 +67,9 @@ World::World(WageEngine *engine) {
 	_saveBeforeCloseMessage = nullptr;
 	_revertMessage = nullptr;
 
+	_globalScript = nullptr;
+	_player = nullptr;
+
 	_weaponMenuDisabled = true;
 
 	_engine = engine;






More information about the Scummvm-git-logs mailing list