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

5 files changed, 13 insertions, 11 deletions

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 4692566bef..529d78dbfb 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1202,8 +1202,9 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			MCONTACT hContact;

 			JABBER_SEARCH_RESULT jsr = { 0 };

 			jsr.hdr.cbSize = sizeof(JABBER_SEARCH_RESULT);

-			mir_sntprintf(jsr.jid, SIZEOF(jsr.jid), _T("%s"), him->m_tszRealJid);

-			if (TCHAR *tmp = _tcschr(jsr.jid, _T('/'))) *tmp = 0;

+			_tcsncpy_s(jsr.jid, him->m_tszRealJid, _TRUNCATE);

+			if (TCHAR *tmp = _tcschr(jsr.jid, _T('/')))

+				*tmp = 0;

 

 			JABBER_LIST_ITEM *item = ppro->ListAdd(LIST_VCARD_TEMP, jsr.jid);

 			ppro->ListAddResource(LIST_VCARD_TEMP, jsr.jid, him->m_iStatus, him->m_tszStatusMessage, him->m_iPriority);

@@ -1218,8 +1219,9 @@ static void sttNickListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK*
 			JABBER_SEARCH_RESULT jsr = { 0 };

 			jsr.hdr.cbSize = sizeof(JABBER_SEARCH_RESULT);

 			jsr.hdr.flags = PSR_TCHAR;

-			mir_sntprintf(jsr.jid, SIZEOF(jsr.jid), _T("%s"), him->m_tszRealJid);

-			if (TCHAR *tmp = _tcschr(jsr.jid, _T('/'))) *tmp = 0;

+			_tcsncpy_s(jsr.jid, him->m_tszRealJid, _TRUNCATE);

+			if (TCHAR *tmp = _tcschr(jsr.jid, _T('/')))

+				*tmp = 0;

 			jsr.hdr.nick = jsr.jid;

 

 			ADDCONTACTSTRUCT acs = { 0 };

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index 66b60174bc..4c21802990 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -1412,7 +1412,7 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 			MCONTACT hContact = HContactFromJID(pNode->GetJid());

 			if (!hContact) {

 				JABBER_SEARCH_RESULT jsr={0};

-				mir_sntprintf(jsr.jid, SIZEOF(jsr.jid), _T("%s"), jid);

+				_tcsncpy_s(jsr.jid, jid, _TRUNCATE);

 				jsr.hdr.cbSize = sizeof(JABBER_SEARCH_RESULT);

 				hContact = (MCONTACT)CallProtoService(m_szModuleName, PS_ADDTOLIST, PALF_TEMPORARY, (LPARAM)&jsr);

 			}

diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp
index 2ce34e50d0..9267f68a48 100644
--- a/protocols/JabberG/src/jabber_rc.cpp
+++ b/protocols/JabberG/src/jabber_rc.cpp
@@ -584,8 +584,8 @@ int CJabberProto::AdhocForwardHandler(HXML, CJabberIqInfo *pInfo, CJabberAdhocSe
 				if (cbBlob < dbei.cbBlob) { // rest of message contains a sender's resource

 					ptrT szOResource( mir_utf8decodeT((LPSTR)dbei.pBlob + cbBlob+1));

 					mir_sntprintf(szOFrom, SIZEOF(szOFrom), _T("%s/%s"), tszJid, szOResource);

-				}

-				else mir_sntprintf(szOFrom, SIZEOF(szOFrom), _T("%s"), tszJid);

+				} else

+					_tcsncpy_s(szOFrom, tszJid, _TRUNCATE);

 

 				addressesNode << XCHILD(_T("address")) << XATTR(_T("type"), _T("ofrom")) << XATTR(_T("jid"), szOFrom);

 				addressesNode << XCHILD(_T("address")) << XATTR(_T("type"), _T("oto")) << XATTR(_T("jid"), m_ThreadInfo->fullJID);

diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp
index f35fcbda5b..e4176528e4 100644
--- a/protocols/JabberG/src/jabber_svc.cpp
+++ b/protocols/JabberG/src/jabber_svc.cpp
@@ -536,7 +536,7 @@ INT_PTR __cdecl CJabberProto::JabberSendNudge(WPARAM hContact, LPARAM)
 	if (szResource)

 		mir_sntprintf(tszJid, SIZEOF(tszJid), _T("%s/%s"), jid, szResource);

 	else

-		mir_sntprintf(tszJid, SIZEOF(tszJid), _T("%s"), jid);

+		_tcsncpy_s(tszJid, jid, _TRUNCATE);

 

 	JabberCapsBits jcb = GetResourceCapabilites(tszJid, FALSE);

 	m_ThreadInfo->send(

diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp
index a6a550ea7f..21a511149b 100644
--- a/protocols/JabberG/src/jabber_userinfo.cpp
+++ b/protocols/JabberG/src/jabber_userinfo.cpp
@@ -281,7 +281,7 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 				if (g_JabberFeatCapPairs[i].tszDescription)
 					mir_sntprintf(szDescription, SIZEOF(szDescription), _T("%s (%s)"), TranslateTS(g_JabberFeatCapPairs[i].tszDescription), g_JabberFeatCapPairs[i].szFeature);
 				else
-					mir_sntprintf(szDescription, SIZEOF(szDescription), _T("%s"), g_JabberFeatCapPairs[i].szFeature);
+					_tcsncpy_s(szDescription, g_JabberFeatCapPairs[i].szFeature, _TRUNCATE);
 				sttFillInfoLine(hwndTree, htiCaps, NULL, NULL, szDescription, sttInfoLineId(resource, INFOLINE_CAPS, i));
 			}
 
@@ -291,7 +291,7 @@ static void sttFillResourceInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM hti
 				if (ppro->m_lstJabberFeatCapPairsDynamic[j]->szDescription)
 					mir_sntprintf(szDescription, SIZEOF(szDescription), _T("%s (%s)"), TranslateTS(ppro->m_lstJabberFeatCapPairsDynamic[j]->szDescription), ppro->m_lstJabberFeatCapPairsDynamic[j]->szFeature);
 				else
-					mir_sntprintf(szDescription, SIZEOF(szDescription), _T("%s"), ppro->m_lstJabberFeatCapPairsDynamic[j]->szFeature);
+					_tcsncpy_s(szDescription, ppro->m_lstJabberFeatCapPairsDynamic[j]->szFeature, _TRUNCATE);
 				sttFillInfoLine(hwndTree, htiCaps, NULL, NULL, szDescription, sttInfoLineId(resource, INFOLINE_CAPS, i));
 			}
 	}
@@ -322,7 +322,7 @@ static void sttFillAdvStatusInfo(CJabberProto *ppro, HWND hwndTree, HTREEITEM ht
 		if (szAdvStatusText && *szAdvStatusText)
 			mir_sntprintf(szText, 2047, _T("%s (%s)"), TranslateTS(szAdvStatusTitle), szAdvStatusText);
 		else
-			mir_sntprintf(szText, 2047, _T("%s"), TranslateTS(szAdvStatusTitle));
+			_tcsncpy_s(szText, TranslateTS(szAdvStatusTitle), _TRUNCATE);
 		sttFillInfoLine(hwndTree, htiRoot, Skin_GetIcon(szAdvStatusIcon), szTitle, szText, dwInfoLine);
 	}