[Scummvm-cvs-logs] scummvm master -> f6acc5d5bef3c472fc3788407486a242fdd68a65
wjp
wjp at usecode.org
Thu May 10 23:07:25 CEST 2012
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:
f6acc5d5be DREAMWEB: Fix crash when entering short console password
Commit: f6acc5d5bef3c472fc3788407486a242fdd68a65
https://github.com/scummvm/scummvm/commit/f6acc5d5bef3c472fc3788407486a242fdd68a65
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2012-05-10T14:06:32-07:00
Commit Message:
DREAMWEB: Fix crash when entering short console password
_inputLine is not a string, so it shouldn't be cast to Common::String.
This fixes bug #3525602.
Changed paths:
engines/dreamweb/monitor.cpp
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index 95aa400..25435ae 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -626,15 +626,12 @@ void DreamWebEngine::signOn() {
_monAdX = prevX;
_monAdY = prevY;
- inputLine = (const char *)_inputLine;
- inputLine.toUppercase();
-
// The entered line has zeroes in-between each character
uint32 len = strlen(monitorKeyEntries[foundIndex].password);
bool found = true;
for (uint32 i = 0; i < len; i++) {
- if (monitorKeyEntries[foundIndex].password[i] != inputLine[i * 2]) {
+ if (monitorKeyEntries[foundIndex].password[i] != _inputLine[i * 2]) {
found = false;
break;
}
More information about the Scummvm-git-logs
mailing list