[Scummvm-cvs-logs] SF.net SVN: scummvm:[35083] scummvm/trunk/engines

[lordhoto at users.sourceforge.net]

Revision: 35083
          http://scummvm.svn.sourceforge.net/scummvm/?rev=35083&view=rev
Author:   lordhoto
Date:     2008-11-15 14:15:17 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
Fixed strncpy usage.

Modified Paths:
--------------
    scummvm/trunk/engines/engine.cpp
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp	2008-11-15 13:54:16 UTC (rev 35082)
+++ scummvm/trunk/engines/engine.cpp	2008-11-15 14:15:17 UTC (rev 35083)
@@ -253,6 +253,8 @@
 
 void Engine::errorString(const char *buf1, char *buf2, int size) {
 	strncpy(buf2, buf1, size);
+	if (size > 0)
+		buf2[size-1] = '\0';
 }
 
 void Engine::pauseEngine(bool pause) {

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2008-11-15 13:54:16 UTC (rev 35082)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2008-11-15 14:15:17 UTC (rev 35083)
@@ -2343,7 +2343,9 @@
 		snprintf(buf2, buf2Size, "(%d:%d:0x%lX): %s", _roomResource,
 			vm.slot[_currentScript].number, (long)(_scriptPointer - _scriptOrgPointer), buf1);
 	} else {
-		strcpy(buf2, buf1);
+		strncpy(buf2, buf1, buf2Size);
+		if (buf2Size > 0)
+			buf2[buf2Size-1] = '\0';
 	}
 }
 


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