From 6e2b6b31bae6d69bff5271451e73eb08637b8118 Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan 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 --- src/core/stdauth/auth.cpp | 2 +- src/core/stdauth/authdialogs.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/core/stdauth') diff --git a/src/core/stdauth/auth.cpp b/src/core/stdauth/auth.cpp index f2cfaa041b..df3ea40221 100644 --- a/src/core/stdauth/auth.cpp +++ b/src/core/stdauth/auth.cpp @@ -75,7 +75,7 @@ static int AuthEventAdded(WPARAM, LPARAM lParam) if (!CallService(MS_CONTACT_GETCONTACTINFO, 0, (LPARAM)&ci)) { switch (ci.type) { case CNFT_ASCIIZ: - mir_sntprintf(szUid, SIZEOF(szUid), _T("%s"), ci.pszVal); + _tcsncpy_s(szUid, ci.pszVal, _TRUNCATE); mir_free(ci.pszVal); break; diff --git a/src/core/stdauth/authdialogs.cpp b/src/core/stdauth/authdialogs.cpp index 99000a8663..fbbc377047 100644 --- a/src/core/stdauth/authdialogs.cpp +++ b/src/core/stdauth/authdialogs.cpp @@ -72,10 +72,10 @@ INT_PTR CALLBACK DlgProcAdded(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if (off) mir_sntprintf(name + off, SIZEOF(name) - off, _T(" (%s)"), nickT); else - mir_sntprintf(name, SIZEOF(name), _T("%s"), nickT); + _tcsncpy_s(name, nickT, _TRUNCATE); } if (!name[0]) - _tcscpy(name, TranslateT("")); + _tcsncpy_s(name, TranslateT(""), _TRUNCATE); TCHAR hdr[256]; if (uin && emailT[0]) @@ -197,10 +197,10 @@ INT_PTR CALLBACK DlgProcAuthReq(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (off) mir_sntprintf(name + off, SIZEOF(name) - off, _T(" (%s)"), (TCHAR*)nickT); else - mir_sntprintf(name, SIZEOF(name), _T("%s"), (TCHAR*)nickT); + _tcsncpy_s(name, nickT, _TRUNCATE); } if (!name[0]) - _tcscpy(name, TranslateT("")); + _tcsncpy_s(name, TranslateT(""), _TRUNCATE); TCHAR hdr[256]; if (uin && emailT[0]) -- cgit v1.2.3