From 03fe9de7ac49af62e95b6dd3341b2012c9a530cf Mon Sep 17 00:00:00 2001
From: brain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>
Date: Mon, 12 May 2008 15:59:57 +0000
Subject: Fix wildcard matching in win32, seems that incrementing an iterator
 dereferences it internally on win32, so iter++ when iter == container.end()
 drops an assert. YES, an assert. No fucking throw, making it a fucking pain
 to debug (no bt on assert, program exits)

git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9706 e03df62e-2008-0410-955e-edbf42e46eb7
---
 src/wildcard.cpp | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'src/wildcard.cpp')

diff --git a/src/wildcard.cpp b/src/wildcard.cpp
index 3a91e8350..2df7a5bec 100644
--- a/src/wildcard.cpp
+++ b/src/wildcard.cpp
@@ -49,17 +49,19 @@ CoreExport bool csmatch(const std::string &str, const std::string &mask)
 
 	while (string != str.end())
 	{
-		if (*wild == '*')
+		if (wild != mask.end() && *wild == '*')
 		{
 			if (++wild == mask.end())
 				return 1;
 
 			mp = wild;
 			cp = string;
-			cp++;
+
+			if (cp != str.end())
+				cp++;
 		}
 		else
-		if ((*wild == *string) || (*wild == '?'))
+		if ((string != str.end() && wild != mask.end()) && ((*wild == *string) || (*wild == '?')))
 		{
 			wild++;
 			string++;
@@ -67,7 +69,10 @@ CoreExport bool csmatch(const std::string &str, const std::string &mask)
 		else
 		{
 			wild = mp;
-			string = cp++;
+			if (cp == str.end())
+				cp = str.end();
+			else
+				string = cp++;
 		}
 
 	}
@@ -98,17 +103,20 @@ CoreExport bool match(const std::string &str, const std::string &mask)
 
 	while (string != str.end())
 	{
-		if (*wild == '*')
+		if (wild != mask.end() && *wild == '*')
 		{
 			if (++wild == mask.end())
 				return 1;
 
 			mp = wild;
 			cp = string;
-			cp++;
+
+			if (cp != str.end())
+				cp++;
+
 		}
 		else
-		if ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?'))
+		if ((string != str.end() && wild != mask.end()) && ((lowermap[(unsigned char)*wild] == lowermap[(unsigned char)*string]) || (*wild == '?')))
 		{
 			wild++;
 			string++;
@@ -116,7 +124,10 @@ CoreExport bool match(const std::string &str, const std::string &mask)
 		else
 		{
 			wild = mp;
-			string = cp++;
+			if (cp == str.end())
+				string = str.end();
+			else
+				string = cp++;
 		}
 
 	}
-- 
cgit v1.2.3