summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-29 15:59:52 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2005-05-29 15:59:52 +0000
commitfec34388a35a01a486eedfeab0a8d3aead3ebb84 (patch)
tree457a1d9cadee10b14bef3d5be00ae250e6f2b388
parent092c202a5e64852d38b3157c0d8c7b51b866a7f2 (diff)
Made erroneous included configs cause the reader to bail
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@1554 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/inspircd_io.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/inspircd_io.cpp b/src/inspircd_io.cpp
index de3d23689..a01048e85 100644
--- a/src/inspircd_io.cpp
+++ b/src/inspircd_io.cpp
@@ -355,6 +355,13 @@ bool LoadConf(const char* filename, std::stringstream *target, std::stringstream
std::string newstuff = merge.str();
*target << newstuff;
}
+ else
+ {
+ // the error propogates up to its parent recursively
+ // causing the config reader to bail at the top level.
+ fclose(conf);
+ return false;
+ }
}
else
{