Merge insp20

1 files changed, 9 insertions, 1 deletions

diff --git a/src/configreader.cpp b/src/configreader.cpp
index af8a15f43..54c32d846 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -41,6 +41,14 @@ ServerConfig::ServerConfig()
 	OperMaxChans = 30;
 	c_ipv4_range = 32;
 	c_ipv6_range = 128;
+
+	std::vector<KeyVal>* items;
+	EmptyTag = ConfigTag::create("empty", "<auto>", 0, items);
+}
+
+ServerConfig::~ServerConfig()
+{
+	delete EmptyTag;
 }
 
 static void ValidHost(const std::string& p, const std::string& msg)
@@ -707,7 +715,7 @@ ConfigTag* ServerConfig::ConfValue(const std::string &tag)
 {
 	ConfigTagList found = config_data.equal_range(tag);
 	if (found.first == found.second)
-		return NULL;
+		return EmptyTag;
 	ConfigTag* rv = found.first->second;
 	found.first++;
 	if (found.first != found.second)