pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-04 02:03:12 +02:00
Code Activity

Fix reading multi line quotes from the conf with blank lines or lines with only whitespace

Browse Source
This commit is contained in:
Adam
2013-05-08 10:12:31 -04:00
parent 9b07e163c0
commit 5e7085130e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config.cpp
+6 -3
View File
@@ -664,6 +664,10 @@ void Conf::LoadConf(File &file)
{
Anope::string line = file.Read();
++linenumber;
/* If this line is completely empty and we are in a quote, just append a newline */
if (line.empty() && in_quote)
wordbuffer += "\n";
for (unsigned c = 0, len = line.length(); c < len; ++c)
{
@@ -673,7 +677,6 @@ void Conf::LoadConf(File &file)
/* Strip leading white spaces from multi line quotes */
if (c == 0)
{
wordbuffer += "\n";
while (c < len && isspace(line[c]))
++c;
ch = line[c];
@@ -784,9 +787,9 @@ void Conf::LoadConf(File &file)
in_word = true;
}
if (ch == ';' || ch == '}' || c + 1 == len)
if (ch == ';' || ch == '}' || c + 1 >= len)
{
bool eol = c + 1 == len;
bool eol = c + 1 >= len;
if (!eol && in_quote)
// Allow ; and } in quoted strings