[Scummvm-cvs-logs] scummvm master -> 91d35cec1a76e2f617666ca4850d9ad64c65020f

eriktorbjorn eriktorbjorn at telia.com
Fri Aug 23 12:21:27 CEST 2013


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:
91d35cec1a AGOS: Use strncpy() instead of strcpy(). CID 1003679, 1003681


Commit: 91d35cec1a76e2f617666ca4850d9ad64c65020f
    https://github.com/scummvm/scummvm/commit/91d35cec1a76e2f617666ca4850d9ad64c65020f
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2013-08-23T03:19:58-07:00

Commit Message:
AGOS: Use strncpy() instead of strcpy(). CID 1003679, 1003681

Changed paths:
    engines/agos/script_pn.cpp



diff --git a/engines/agos/script_pn.cpp b/engines/agos/script_pn.cpp
index 60a1376..61dce0b 100644
--- a/engines/agos/script_pn.cpp
+++ b/engines/agos/script_pn.cpp
@@ -381,7 +381,8 @@ void AGOSEngine_PN::opn_opcode31() {
 		case 0:
 			getFilename();
 			slot = matchSaveGame(_saveFile, countSaveGames());
-			strcpy(bf, genSaveName(slot));
+			strncpy(bf, genSaveName(slot), sizeof(bf));
+			bf[sizeof(bf) - 1] = 0;
 			break;
 		case 1:
 			strcpy(bf, "pn.sav");
@@ -419,9 +420,10 @@ void AGOSEngine_PN::opn_opcode32() {
 			getFilename();
 			slot = matchSaveGame(_saveFile, curSlot);
 			if (slot != -1)
-				strcpy(bf, genSaveName(slot));
+				strncpy(bf, genSaveName(slot), sizeof(bf));
 			else
-				strcpy(bf, genSaveName(curSlot));
+				strncpy(bf, genSaveName(curSlot), sizeof(bf));
+			bf[sizeof(bf) - 1] = 0;
 			break;
 		case 1:
 			strcpy(bf, "pn.sav");






More information about the Scummvm-git-logs mailing list