From 15b4d00e919d97015c208fff867862ef028995de Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Mon, 1 Dec 2014 23:27:22 +0000
Subject: static mir_tstrncpy replaced with direct _tcsncpy_s calls

git-svn-id: http://svn.miranda-ng.org/main/trunk@11209 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/container.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'plugins/TabSRMM/src/container.cpp')

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 37f5c4a4d9..7239a16651 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1990,15 +1990,12 @@ int TSAPI CutContactName(const TCHAR *oldname, TCHAR *newname, unsigned int size
 {
 	int cutMax = PluginConfig.m_CutContactNameTo;
 
-	if (mir_tstrlen(oldname) <= cutMax) {
-		mir_tstrncpy(newname, oldname, size);
-		newname[size - 1] = 0;
-	}
+	if (mir_tstrlen(oldname) <= cutMax)
+		_tcsncpy_s(newname, size, oldname, _TRUNCATE);
 	else {
-		TCHAR fmt[20];
-		mir_sntprintf(fmt, 18, _T("%%%d.%ds..."), cutMax, cutMax);
+		TCHAR fmt[30];
+		mir_sntprintf(fmt, SIZEOF(fmt), _T("%%%d.%ds..."), cutMax, cutMax);
 		mir_sntprintf(newname, size, fmt, oldname);
-		newname[size - 1] = 0;
 	}
 	return 0;
 }
-- 
cgit v1.2.3