From 7c16f0bc7af13884de18712d9b66c7e7218d51c0 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sat, 1 Feb 2014 08:57:57 +0000
Subject: own exception dialog removed from tabSRMM

git-svn-id: http://svn.miranda-ng.org/main/trunk@7981 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/chat/window.cpp | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'plugins/TabSRMM/src/chat/window.cpp')

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index 92dc53fd9b..622b0b86ad 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -521,7 +521,7 @@ static bool TabAutoComplete(HWND hwnd, MESSAGESUBDATA *dat, SESSION_INFO *si)
 
 	bool isTopic = false, isRoom = false;
 	TCHAR *pszName = NULL;
-	TCHAR *pszText = (TCHAR*)Utils::safeMirCalloc((iLen + 10) * sizeof(TCHAR));
+	TCHAR *pszText = (TCHAR*)mir_calloc((iLen + 10) * sizeof(TCHAR));
 
 	gt.flags = GT_DEFAULT;
 	gt.cb = (iLen + 9) * sizeof(TCHAR);
@@ -555,10 +555,7 @@ LBL_SkipEnd:
 			isTopic = TRUE;
 	}
 	if (dat->szSearchQuery == NULL) {
-		size_t len = (end - start) + 1;
-		dat->szSearchQuery = (TCHAR*)Utils::safeMirAlloc(sizeof(TCHAR) * len);
-		wcsncpy(dat->szSearchQuery, pszText + start, len);
-		dat->szSearchQuery[len - 1] = 0;
+		dat->szSearchQuery = mir_tstrndup(pszText + start, end - start);
 		dat->szSearchResult = mir_tstrdup(dat->szSearchQuery);
 		dat->lastSession = NULL;
 	}
@@ -578,7 +575,7 @@ LBL_SkipEnd:
 		if (end != start) {
 			ptrT szReplace;
 			if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) {
-				szReplace = (TCHAR*)Utils::safeMirAlloc((wcslen(pszName) + 4) * sizeof(TCHAR));
+				szReplace = (TCHAR*)mir_alloc((wcslen(pszName) + 4) * sizeof(TCHAR));
 				wcscpy(szReplace, pszName);
 				wcscat(szReplace, L": ");
 				pszName = szReplace;
-- 
cgit v1.2.3