From 266e4e01e879d02f16fa1940aaeaa29b0990756d Mon Sep 17 00:00:00 2001
From: Tobias Weimer <wishmaster51@googlemail.com>
Date: Fri, 12 Dec 2014 09:00:02 +0000
Subject: NewXStatusNotify: -Fixed warnings -Fixed possible crashes

git-svn-id: http://svn.miranda-ng.org/main/trunk@11340 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/NewXstatusNotify/src/main.cpp    |  9 ++++----
 plugins/NewXstatusNotify/src/utils.cpp   |  2 +-
 plugins/NewXstatusNotify/src/xstatus.cpp | 38 ++++++++++++++++++--------------
 3 files changed, 27 insertions(+), 22 deletions(-)

(limited to 'plugins/NewXstatusNotify/src')

diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp
index 0356a5cab3..d1adcb6c87 100644
--- a/plugins/NewXstatusNotify/src/main.cpp
+++ b/plugins/NewXstatusNotify/src/main.cpp
@@ -182,16 +182,15 @@ static int CompareStatusMsg(STATUSMSGINFO *smi, DBCONTACTWRITESETTING *cws_new,
 
 TCHAR *GetStr(STATUSMSGINFO *n, const TCHAR *tmplt)
 {
-	TCHAR tmp[1024];
-
-	if (tmplt == NULL || tmplt[0] == _T('\0'))
+	if (n == NULL || tmplt == NULL || tmplt[0] == _T('\0'))
 		return NULL;
 
 	TCHAR *str = (TCHAR *)mir_alloc(2048 * sizeof(TCHAR));
 	str[0] = _T('\0');
-	int len = mir_tstrlen(tmplt);
+	size_t len = mir_tstrlen(tmplt);
 
-	for (int i = 0; i < len; i++) {
+	TCHAR tmp[1024];
+	for (size_t i = 0; i < len; i++) {
 		tmp[0] = _T('\0');
 
 		if (tmplt[i] == _T('%')) {
diff --git a/plugins/NewXstatusNotify/src/utils.cpp b/plugins/NewXstatusNotify/src/utils.cpp
index b3fd4781ea..d5fe0e3902 100644
--- a/plugins/NewXstatusNotify/src/utils.cpp
+++ b/plugins/NewXstatusNotify/src/utils.cpp
@@ -111,7 +111,7 @@ WCHAR *mir_dupToUnicodeEx(char *ptr, UINT CodePage)
 TCHAR *AddCR(const TCHAR *stzText)
 {
 	const TCHAR *found;
-	int i = 0, len = mir_tstrlen(stzText), j;
+	size_t i = 0, len = mir_tstrlen(stzText), j;
 	TCHAR *tmp = (TCHAR *)mir_alloc(1024 * sizeof(TCHAR));
 	*tmp = _T('\0');
 	while ((found = _tcsstr((stzText + i), _T("\n"))) != NULL && _tcslen(tmp) + 1 < 1024) {
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp
index 06cbeffe0e..fb931d39de 100644
--- a/plugins/NewXstatusNotify/src/xstatus.cpp
+++ b/plugins/NewXstatusNotify/src/xstatus.cpp
@@ -80,30 +80,27 @@ TCHAR *GetStatusTypeAsString(int type, TCHAR *buff)
 {
 	switch (type) {
 	case TYPE_JABBER_MOOD:
-		_tcscpy(buff, TranslateT("Mood")); break;
+		_tcscpy(buff, TranslateT("Mood")); return buff;
 	case TYPE_JABBER_ACTIVITY:
-		_tcscpy(buff, TranslateT("Activity")); break;
+		_tcscpy(buff, TranslateT("Activity")); return buff;
 	case TYPE_ICQ_XSTATUS:
-		_tcscpy(buff, TranslateT("xStatus")); break;
+		_tcscpy(buff, TranslateT("xStatus")); return buff;
 	default:
-		_tcscpy(buff, TranslateT("<unknown>"));
+		_tcscpy(buff, TranslateT("<unknown>")); return buff;
 	}
-
-	return buff;
 }
 
 TCHAR *ReplaceVars(XSTATUSCHANGE *xsc, const TCHAR *tmplt)
 {
-	TCHAR tmp[1024];
-
-	if (tmplt == NULL || tmplt[0] == _T('\0'))
+	if (xsc == NULL || tmplt == NULL || tmplt[0] == _T('\0'))
 		return NULL;
 
 	TCHAR *str = (TCHAR *)mir_alloc(2048 * sizeof(TCHAR));
 	str[0] = _T('\0');
-	int len = mir_tstrlen(tmplt);
+	size_t len = mir_tstrlen(tmplt);
 
-	for (int i = 0; i < len; i++) {
+	TCHAR tmp[1024];
+	for (size_t i = 0; i < len; i++) {
 		tmp[0] = _T('\0');
 
 		if (tmplt[i] == _T('%')) {
@@ -179,6 +176,9 @@ TCHAR *ReplaceVars(XSTATUSCHANGE *xsc, const TCHAR *tmplt)
 
 void ShowXStatusPopup(XSTATUSCHANGE *xsc)
 {
+	if (xsc == NULL)
+		return;
+
 	HICON hIcon = NULL;
 
 	switch (xsc->type) {
@@ -239,6 +239,9 @@ void ShowXStatusPopup(XSTATUSCHANGE *xsc)
 
 void BlinkXStatusIcon(XSTATUSCHANGE *xsc)
 {
+	if (xsc == NULL)
+		return;
+
 	HICON hIcon = NULL;
 	TCHAR str[256] = {0};
 	TCHAR stzType[32];
@@ -274,19 +277,19 @@ void PlayXStatusSound(MCONTACT hContact, int action)
 {
 	switch (action) {
 	case NOTIFY_NEW_XSTATUS:
-		PlayChangeSound(hContact, XSTATUS_SOUND_CHANGED); break;
+		PlayChangeSound(hContact, XSTATUS_SOUND_CHANGED); return;
 	case NOTIFY_REMOVE_XSTATUS:
-		PlayChangeSound(hContact, XSTATUS_SOUND_REMOVED); break;
+		PlayChangeSound(hContact, XSTATUS_SOUND_REMOVED); return;
 	case NOTIFY_NEW_MESSAGE:
-		PlayChangeSound(hContact, XSTATUS_SOUND_MSGCHANGED); break;
+		PlayChangeSound(hContact, XSTATUS_SOUND_MSGCHANGED); return;
 	case NOTIFY_REMOVE_MESSAGE:
-		PlayChangeSound(hContact, XSTATUS_SOUND_MSGREMOVED); break;
+		PlayChangeSound(hContact, XSTATUS_SOUND_MSGREMOVED); return;
 	}
 }
 
 void LogChangeToDB(XSTATUSCHANGE *xsc)
 {
-	if (opt.XLogToDB_WinOpen && !CheckMsgWnd(xsc->hContact))
+	if (xsc == NULL || (opt.XLogToDB_WinOpen && !CheckMsgWnd(xsc->hContact)))
 		return;
 
 	TCHAR *Template = _T("");
@@ -337,6 +340,9 @@ void LogChangeToDB(XSTATUSCHANGE *xsc)
 
 void LogChangeToFile(XSTATUSCHANGE *xsc)
 {
+	if (xsc == NULL)
+		return;
+
 	TCHAR stzDate[32], stzTime[32], stzText[MAX_TEXT_LEN];
 
 	GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL,_T("HH':'mm"), stzTime, SIZEOF(stzTime));
-- 
cgit v1.2.3