[Scummvm-cvs-logs] SF.net SVN: scummvm:[42049] scummvm/trunk/engines/sci/engine/kfile.cpp

[thebluegr at users.sourceforge.net]

Revision: 42049
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42049&view=rev
Author:   thebluegr
Date:     2009-07-03 07:06:48 +0000 (Fri, 03 Jul 2009)

Log Message:
-----------
Applied patch #2815937 - "SCI: ReadString fix to repair LSL5 password". This fixes the problems with the LSL5 password for good

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kfile.cpp

Modified: scummvm/trunk/engines/sci/engine/kfile.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kfile.cpp	2009-07-03 06:21:04 UTC (rev 42048)
+++ scummvm/trunk/engines/sci/engine/kfile.cpp	2009-07-03 07:06:48 UTC (rev 42049)
@@ -267,6 +267,12 @@
 		return;
 	}
 	f->_in->readLine_NEW(dest, maxsize);
+	// The returned string must not have an ending LF
+	int strSize = strlen(dest);
+	if (strSize > 0) {
+		if (dest[strSize - 1] == 0x0A)
+			dest[strSize - 1] = 0;
+	}
 
 	debugC(2, kDebugLevelFile, "FGets'ed \"%s\"\n", dest);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.