Do not import forbids with wildcards in their names, how 1.8 treats wildcaded forbids depends on the IRCd

1 files changed, 18 insertions, 0 deletions

diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp
index ebf29dea0..8fe57cfdd 100644
--- a/modules/database/db_old.cpp
+++ b/modules/database/db_old.cpp
@@ -620,7 +620,16 @@ static void LoadNicks()
 			if (tmpu16 & OLD_NS_VERBOTEN)
 			{
 				if (!forbid)
+				{
+					delete nc;
+					continue;
+				}
+
+				if (nc->display.find_first_of("?*") != Anope::string::npos)
+				{
+					delete nc;
 					continue;
+				}
 
 				ForbidData *d = forbid->CreateForbid();
 				d->mask = nc->display;
@@ -1029,7 +1038,16 @@ static void LoadChannels()
 			if (forbid_chan)
 			{
 				if (!forbid)
+				{
+					delete ci;
+					continue;
+				}
+
+				if (ci->name.find_first_of("?*") != Anope::string::npos)
+				{
+					delete ci;
 					continue;
+				}
 
 				ForbidData *d = forbid->CreateForbid();
 				d->mask = ci->name;