From 7b7953aaf2aa0895604e57fe0136ba9a5831349c Mon Sep 17 00:00:00 2001
From: Adam
Date: Thu, 26 Oct 2017 20:23:24 -0400
Subject: ConfigReader: fix compilers optimizing NULL check in
 ConfigTag::readString()

See: 66f82ccf926aac39273bfc652c85c08080cc9a46

Fixes inspircd/inspircd-extras#110
---
 src/modules.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/modules.cpp')

diff --git a/src/modules.cpp b/src/modules.cpp
index b2d2f23c6..79a33e617 100644
--- a/src/modules.cpp
+++ b/src/modules.cpp
@@ -641,7 +641,8 @@ static ConfigTag* SlowGetTag(const std::string &tag, int index)
 std::string ConfigReader::ReadValue(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool allow_linefeeds)
 {
 	std::string result = default_value;
-	if (!SlowGetTag(tag, index)->readString(name, result, allow_linefeeds))
+	ConfigTag* conftag = SlowGetTag(tag, index);
+	if (!conftag || !conftag->readString(name, result, allow_linefeeds))
 	{
 		this->error = CONF_VALUE_NOT_FOUND;
 	}
@@ -656,7 +657,8 @@ std::string ConfigReader::ReadValue(const std::string &tag, const std::string &n
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, const std::string &default_value, int index)
 {
 	bool def = (default_value == "yes");
-	return SlowGetTag(tag, index)->getBool(name, def);
+	ConfigTag* conftag = SlowGetTag(tag, index);
+	return conftag ? conftag->getBool(name, def) : def;
 }
 
 bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int index)
@@ -668,7 +670,8 @@ bool ConfigReader::ReadFlag(const std::string &tag, const std::string &name, int
 int ConfigReader::ReadInteger(const std::string &tag, const std::string &name, const std::string &default_value, int index, bool need_positive)
 {
 	int v = atoi(default_value.c_str());
-	int result = SlowGetTag(tag, index)->getInt(name, v);
+	ConfigTag* conftag = SlowGetTag(tag, index);
+	int result = conftag ? conftag->getInt(name, v) : v;
 
 	if ((need_positive) && (result < 0))
 	{
-- 
cgit v1.3.1-10-gc9f91