From e63926f79d51119b829d683983e562527f7dd10a Mon Sep 17 00:00:00 2001
From: Rozhuk Ivan <rozhuk.im@gmail.com>
Date: Thu, 4 Dec 2014 23:42:36 +0000
Subject: Db_autobackups: multiple changes + varios fixs

git-svn-id: http://svn.miranda-ng.org/main/trunk@11245 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/MenuItemEx/src/main.cpp | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

(limited to 'plugins/MenuItemEx')

diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp
index 4eec8a98c1..8e1dc6778a 100644
--- a/plugins/MenuItemEx/src/main.cpp
+++ b/plugins/MenuItemEx/src/main.cpp
@@ -268,24 +268,21 @@ BOOL isMetaContact(MCONTACT hContact)
 	return FALSE;
 }
 
-void GetID(MCONTACT hContact, LPSTR szProto, LPSTR szID)
+void GetID(MCONTACT hContact, LPSTR szProto, LPSTR szID, size_t dwIDSize)
 {
 	DBVARIANT dbv_uniqueid;
 	LPSTR uID = (LPSTR)CallProtoService(szProto, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);
 	if (uID == (LPSTR)CALLSERVICE_NOTFOUND)
 		uID = NULL;
 
-	*szID = '\0';
-
+	szID[0] = 0;
 	if (uID && db_get(hContact, szProto, uID, &dbv_uniqueid) == 0) {
 		if (dbv_uniqueid.type == DBVT_DWORD)
-			wsprintfA(szID, "%u", dbv_uniqueid.dVal); //!!!!!!!!!
+			mir_snprintf(szID, dwIDSize, "%u", dbv_uniqueid.dVal);
 		else if (dbv_uniqueid.type == DBVT_WORD)
-			wsprintfA(szID, "%u", dbv_uniqueid.wVal); //!!!!!!!!!
-		else if (dbv_uniqueid.type == DBVT_BLOB)
-			wsprintfA(szID, "%s", dbv_uniqueid.cpbVal); //!!!!!!!!!
+			mir_snprintf(szID, dwIDSize, "%u", dbv_uniqueid.wVal);
 		else
-			wsprintfA(szID, "%s", dbv_uniqueid.pszVal); //!!!!!!!!
+			strncpy_s(szID, dwIDSize, (char*)dbv_uniqueid.cpbVal, _TRUNCATE);
 
 		db_free(&dbv_uniqueid);
 	}
@@ -512,7 +509,7 @@ void ModifyCopyID(MCONTACT hContact, BOOL bShowID, BOOL bTrimID)
 
 	TCHAR buffer[256];
 	char szID[256];
-	GetID(hContact, szProto, (LPSTR)&szID);
+	GetID(hContact, szProto, (LPSTR)&szID, SIZEOF(szID));
 	if (szID[0])  {
 		if (bShowID) {
 			if (bTrimID && (strlen(szID) > MAX_IDLEN)) {
@@ -589,7 +586,7 @@ void ModifyCopyMirVer(MCONTACT hContact)
 
 INT_PTR onCopyID(WPARAM wparam, LPARAM lparam)
 {
-	char szID[128] = { 0 }, buffer[256] = { 0 };
+	char szID[256], buffer[256];
 
 	MCONTACT hContact = (MCONTACT)wparam;
 	if (isMetaContact(hContact)) {
@@ -603,7 +600,7 @@ INT_PTR onCopyID(WPARAM wparam, LPARAM lparam)
 	if (szProto == NULL)
 		return 0;
 
-	GetID(hContact, szProto, (LPSTR)&szID);
+	GetID(hContact, szProto, (LPSTR)&szID, SIZEOF(szID));
 
 	if (db_get_dw(NULL, MODULENAME, "flags", vf_default) & VF_CIDN) {
 		PROTOACCOUNT *pa = ProtoGetAccount(szProto);
@@ -612,8 +609,8 @@ INT_PTR onCopyID(WPARAM wparam, LPARAM lparam)
 			mir_snprintf(buffer, SIZEOF(buffer), "%s: %s", pa->szProtoName, szID);
 		else
 			mir_snprintf(buffer, SIZEOF(buffer), "%s: %s", szProto, szID);
-	}
-	else strcpy(buffer, szID);
+	} else
+		strcpy(buffer, szID);
 
 	CopyToClipboard((HWND)lparam, buffer, 0);
 	if (CTRL_IS_PRESSED && bPopupService)
-- 
cgit v1.2.3