From c422ae9d8a90aeb63da3e3fdf521323fe6769828 Mon Sep 17 00:00:00 2001
From: Einar Johan Trøan Sømåen
Date: Sat, 11 Aug 2012 02:30:07 +0200
Subject: WINTERMUTE: Get rid of strncpy+manual termination.

---
 engines/wintermute/base/base_parser.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'engines/wintermute/base/base_parser.cpp')

diff --git a/engines/wintermute/base/base_parser.cpp b/engines/wintermute/base/base_parser.cpp
index 1b39b55768..75268f6483 100644
--- a/engines/wintermute/base/base_parser.cpp
+++ b/engines/wintermute/base/base_parser.cpp
@@ -386,8 +386,7 @@ int BaseParser::scanStr(const char *in, const char *format, ...) {
 					in++;
 					const char *in2 = strchr(in, '\'');
 					if (in2) {
-						strncpy(a, in, (int)(in2 - in));
-						a[(int)(in2 - in)] = 0;
+						Common::strlcpy(a, in, (int)(in2 - in) + 1);
 						in = in2 + 1;
 					} else {
 						strcpy(a, in);
@@ -395,8 +394,7 @@ int BaseParser::scanStr(const char *in, const char *format, ...) {
 					}
 				} else {
 					const char *in2 = in + strspn(in, "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_0123456789.");
-					strncpy(a, in, (int)(in2 - in));
-					a[(int)(in2 - in)] = 0;
+					Common::strlcpy(a, in, (int)(in2 - in) + 1);
 					in = in2;
 				}
 				in += strspn(in, " \t\n\f");
-- 
cgit v1.2.3