From 6e2b6b31bae6d69bff5271451e73eb08637b8118 Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Tue, 2 Dec 2014 03:47:27 +0000
Subject: mir_sntprintf(..., _T("%s"), ...) -> _tcsncpy_s(..., ..., _TRUNCATE)
 fix some x64 ptr truncations

git-svn-id: http://svn.miranda-ng.org/main/trunk@11211 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp |  2 +-
 plugins/Clist_nicer/src/clcutils.cpp              | 56 ++++++++++++++---------
 2 files changed, 36 insertions(+), 22 deletions(-)

(limited to 'plugins/Clist_nicer')

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 3a18f1ba92..2a3d4829ee 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -918,7 +918,7 @@ INT_PTR CLUIFramesGetFrameOptions(WPARAM wParam, LPARAM lParam)
 		return (INT_PTR)Frames[pos].align;
 
 	case FO_FLOATING:
-		return (int)Frames[pos].floating;
+		return (INT_PTR)Frames[pos].floating;
 
 	case FO_FLAGS:
 		INT_PTR dwFlags = 0;
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp
index 3b0019626c..c700c5607c 100644
--- a/plugins/Clist_nicer/src/clcutils.cpp
+++ b/plugins/Clist_nicer/src/clcutils.cpp
@@ -48,38 +48,52 @@ static int MY_pathIsAbsolute(const TCHAR *path)
 
 size_t MY_pathToRelative(const TCHAR *pSrc, TCHAR *pOut)
 {
-	if ( !pSrc || !mir_tstrlen(pSrc) || mir_tstrlen(pSrc) > MAX_PATH)
-		return 0;
+	size_t dwSrcLen, dwProfilePathLen;
 
-	if ( !MY_pathIsAbsolute(pSrc)) {
-		mir_sntprintf(pOut, MAX_PATH, _T("%s"), pSrc);
-		return mir_tstrlen(pOut);
-	}
+	if (!pSrc || !pOut)
+		return 0;
+	dwSrcLen = mir_tstrlen(pSrc);
+	if (!dwSrcLen || dwSrcLen > (MAX_PATH - 1))
+		return 0;
+	if (!MY_pathIsAbsolute(pSrc))
+		goto path_not_abs;
 
 	TCHAR szTmp[MAX_PATH];
-	mir_sntprintf(szTmp, SIZEOF(szTmp), _T("%s"), pSrc);
+	memcpy(szTmp, pSrc, (dwSrcLen * sizeof(TCHAR)));
+	szTmp[dwSrcLen] = 0;
 	_tcslwr(szTmp);
-	if ( _tcsstr(szTmp, cfg::dat.tszProfilePath)) {
-		mir_sntprintf(pOut, MAX_PATH, _T("%s"), pSrc + mir_tstrlen(cfg::dat.tszProfilePath) - 1);
-		pOut[0]='.';
-		return mir_tstrlen(pOut);
-	}
-
-	mir_sntprintf(pOut, MAX_PATH, _T("%s"), pSrc);
-	return mir_tstrlen(pOut);
+	if (_tcsstr(szTmp, cfg::dat.tszProfilePath)) {
+		dwProfilePathLen = mir_tstrlen(cfg::dat.tszProfilePath);
+		memcpy(pOut, (pSrc + (dwProfilePathLen - 1)), ((dwSrcLen - (dwProfilePathLen - 1)) * sizeof(TCHAR)));
+		pOut[0] = '.';
+		pOut[dwSrcLen] = 0;
+		return (dwSrcLen - (dwProfilePathLen - 1));
+	}
+
+path_not_abs:
+	memcpy(pOut, pSrc, (dwSrcLen * sizeof(TCHAR)));
+	pOut[dwSrcLen] = 0;
+	return dwSrcLen;
 }
 
 size_t MY_pathToAbsolute(const TCHAR *pSrc, TCHAR *pOut)
 {
-	if ( !pSrc || !mir_tstrlen(pSrc) || mir_tstrlen(pSrc) > MAX_PATH)
+	size_t dwSrcLen;
+
+	if (!pSrc || !pOut)
+		return 0;
+	dwSrcLen = mir_tstrlen(pSrc);
+	if (!dwSrcLen || dwSrcLen > (MAX_PATH - 1))
 		return 0;
 
-	if (MY_pathIsAbsolute(pSrc)&&pSrc[0]!='.')
-		mir_sntprintf(pOut, MAX_PATH, _T("%s"), pSrc);
-	else if (pSrc[0]=='.')
-		mir_sntprintf(pOut, MAX_PATH, _T("%s\\%s"), cfg::dat.tszProfilePath, pSrc);
+	if (MY_pathIsAbsolute(pSrc) && pSrc[0] != '.') {
+		memcpy(pOut, pSrc, (dwSrcLen * sizeof(TCHAR)));
+		pOut[dwSrcLen] = 0;
+		return dwSrcLen;
+	if (pSrc[0] == '.')
+		return (mir_sntprintf(pOut, MAX_PATH, _T("%s\\%s"), cfg::dat.tszProfilePath, pSrc));
 
-	return mir_tstrlen(pOut);
+	return 0;
 }
 
 /*
-- 
cgit v1.2.3