From f8652cea748e62a077761bd30f52fb2c8e9bbb98 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Thu, 19 Nov 2020 15:08:31 +0300
Subject: IRC: fix for that C-style tokenizer that crashes on invalid data

---
 protocols/IRCG/src/options.cpp | 64 ++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 34 deletions(-)

(limited to 'protocols/IRCG/src')

diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index 727ffaaf34..69c812357e 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -114,59 +114,55 @@ void CIrcProto::WriteSettings(TDbSetting *sets, int count)
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-static int sttServerEnum(const char* szSetting, void*)
+static int sttServerEnum(const char *szSetting, void *)
 {
-	DBVARIANT dbv;
-	if (db_get_s(0, SERVERSMODULE, szSetting, &dbv))
+	CMStringA szValue(db_get_sm(0, SERVERSMODULE, szSetting));
+	if (szValue.IsEmpty())
+		return 0;
+
+	int iStart = 0;
+	CMStringA szName, szAddress, szPort, szGroup;
+	szName = szValue.Tokenize(":", iStart); // skip SERVER
+	szAddress = szValue.Tokenize(":", iStart);
+	if (szName.IsEmpty() || szAddress.IsEmpty())
 		return 0;
 
+	szPort = szValue.Tokenize(":", iStart);
+	szGroup = szValue.Tokenize(":", iStart);
+
 	SERVER_INFO *pData = new SERVER_INFO;
 	pData->m_name = mir_strdup(szSetting);
 
-	char *p1 = strchr(dbv.pszVal, ':');
-	if (p1 == nullptr)
-		return 0;
-
-	p1++;
 	pData->m_iSSL = 0;
-	if (!_strnicmp(p1, "SSL", 3)) {
-		p1 += 3;
-		if (*p1 == '1')
+	if (!_strnicmp(szAddress, "SSL", 3)) {
+		if (szAddress[3] == '1')
 			pData->m_iSSL = 1;
-		else if (*p1 == '2')
+		else if (szAddress[3] == '2')
 			pData->m_iSSL = 2;
-		p1++;
+		szAddress.Delete(0, 4);
 	}
-	
-	char *p2 = strchr(p1, ':');
-	pData->m_address = (char*)mir_alloc(p2 - p1 + 1);
-	mir_strncpy(pData->m_address, p1, p2 - p1 + 1);
 
-	p1 = p2 + 1;
-	while (*p2 != 'G' && *p2 != '-')
-		p2++;
+	pData->m_address = mir_strdup(szAddress);
+
+	for (iStart = 0; iStart < szPort.GetLength(); iStart++)
+		if (szPort[iStart] == 'G' || szPort[iStart] == '-')
+			break;
 
-	char *buf = (char*)alloca(p2 - p1 + 1);
-	mir_strncpy(buf, p1, p2 - p1 + 1);
-	pData->m_portStart = atoi(buf);
+	pData->m_portStart = atoi(szPort.Left(iStart));
 
-	if (*p2 == 'G')
+	if (szPort[iStart] == 'G')
 		pData->m_portEnd = pData->m_portStart;
 	else {
-		p1 = p2 + 1;
-		p2 = strchr(p1, 'G');
-		buf = (char*)alloca(p2 - p1 + 1);
-		mir_strncpy(buf, p1, p2 - p1 + 1);
-		pData->m_portEnd = atoi(buf);
+		int iEnd = szPort.Find('G', ++iStart);
+		if (iEnd == -1)
+			return 0;
+
+		pData->m_portEnd = atoi(szPort.Mid(iStart, iEnd - iStart));
 	}
 
-	p1 = strchr(p2, ':') + 1;
-	p2 = strchr(p1, 0);
-	pData->m_group = (char*)mir_alloc(p2 - p1 + 1);
-	mir_strncpy(pData->m_group, p1, p2 - p1 + 1);
+	pData->m_group = mir_strdup(szGroup);
 
 	g_servers.insert(pData);
-	db_free(&dbv);
 	return 0;
 }
 
-- 
cgit v1.2.3