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

[eriktorbjorn]

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

Summary:
bf27ff1438 DREAMWEB: Increase _operand1 buffer size


Commit: bf27ff1438ff0a85ed3888e55c39f0509a109335
    https://github.com/scummvm/scummvm/commit/bf27ff1438ff0a85ed3888e55c39f0509a109335
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2012-09-14T11:22:12-07:00

Commit Message:
DREAMWEB: Increase _operand1 buffer size

Theoretically, it should be almost as big as _inputLine, so let's
make them the exact same size just for simplicity. This fixes crashes
for me when trying to use very long parameters to the monitor's READ
command, and could possibly fix a bug reported in the German version
where you supposedly have to read "kurzmitteilung".

Changed paths:
    engines/dreamweb/dreamweb.h
    engines/dreamweb/monitor.cpp



diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 1f6deb8..a4597b1 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -196,7 +196,7 @@ protected:
 
 	// from monitor.cpp
 	char _inputLine[64];
-	char _operand1[14];
+	char _operand1[64];
 	char _currentFile[14];
 
 	// from newplace.cpp
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 4e9d8ee..1886a80 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -194,7 +194,7 @@ void DreamWebEngine::printLogo() {
 }
 
 void DreamWebEngine::input() {
-	memset(_inputLine, 0, 64);
+	memset(_inputLine, 0, sizeof(_inputLine));
 	_curPos = 0;
 	printChar(_monitorCharset, _monAdX, _monAdY, '>', 0, NULL, NULL);
 	multiDump(_monAdX, _monAdY, 6, 8);
@@ -665,7 +665,7 @@ void DreamWebEngine::searchForFiles(const char *filesString) {
 const char *DreamWebEngine::parser() {
 	char *output = _operand1;
 
-	memset(output, 0, 14);
+	memset(output, 0, sizeof(_operand1));
 
 	*output++ = '=';