summaryrefslogtreecommitdiff
path: root/plugins/Utils
diff options
context:
space:
mode:
authorRozhuk Ivan <rozhuk.im@gmail.com>2014-12-02 03:47:27 +0000
committerRozhuk Ivan <rozhuk.im@gmail.com>2014-12-02 03:47:27 +0000
commit6e2b6b31bae6d69bff5271451e73eb08637b8118 (patch)
treeca636f1497e4cc6980736d56a7ff61e3a6f88079 /plugins/Utils
parentd83beb598f0944dcb944524b1d27525dc320cf18 (diff)
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
Diffstat (limited to 'plugins/Utils')
-rw-r--r--plugins/Utils/mir_options.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/Utils/mir_options.cpp b/plugins/Utils/mir_options.cpp
index 7d7e9fdbc3..ea8844b93b 100644
--- a/plugins/Utils/mir_options.cpp
+++ b/plugins/Utils/mir_options.cpp
@@ -76,10 +76,9 @@ static void PathToRelative(TCHAR *pOut, size_t outSize, const TCHAR *pSrc)
}
size_t len = mir_tstrlen(dbPath);
- if (_tcsnicmp(pSrc, dbPath, len))
- mir_sntprintf(pOut, outSize, _T("%s"), pSrc + len);
- else
- mir_tstrncpy(pOut, pSrc, (int)outSize);
+ if (!_tcsnicmp(pSrc, dbPath, len))
+ len = 0;
+ _tcsncpy_s(pOut, outSize, (pSrc + len), _TRUNCATE);
}
}