summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-05-01 19:40:23 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-05-01 19:40:23 +0000
commit347f05019fcb401f33cef5c0d0f3add0cb8d09b0 (patch)
tree5284fc1e38fb0565e548c617a092f22c5f232c45
parent236c4d0ad042cee0057c6e1b812b5eeac95fb771 (diff)
Need checks in two places for escaping to work.
First check when reading lines, to let the parser know that \" etc dont open new quotes or close them, then second check when parsing that line so that the parser knows that \" etc dont delimit a value. git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3923 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/configreader.cpp28
1 files changed, 22 insertions, 6 deletions
diff --git a/src/configreader.cpp b/src/configreader.cpp
index b7e3d24dc..9f8ae0ef0 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -898,12 +898,18 @@ bool ServerConfig::LoadConf(ConfigDataHash &target, const char* filename, std::o
* Note that this WILL NOT usually allow insertion of newlines,
* because a newline is two characters long. Use it primarily to
* insert the " symbol.
+ *
+ * Note that this also involves a further check when parsing the line,
+ * which can be found below.
*/
- if ((ch == '\\') && in_quote && in_tag)
+ if ((ch == '\\') && (in_quote) && (in_tag))
{
+ line += ch;
+ log(DEBUG,"Escape sequence in config line.");
char real_character;
if (conf.get(real_character))
{
+ log(DEBUG,"Escaping %c", real_character);
line += real_character;
continue;
}
@@ -1042,12 +1048,12 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
else
{
/* We have the tag name */
- if(!got_key)
+ if (!got_key)
{
/* We're still reading the key name */
- if(*c != '=')
+ if (*c != '=')
{
- if(*c != ' ')
+ if (*c != ' ')
{
current_key += *c;
}
@@ -1061,9 +1067,19 @@ bool ServerConfig::ParseLine(ConfigDataHash &target, std::string &line, long lin
else
{
/* We have the key name, now we're looking for quotes and the value */
- if(*c == '"')
+
+ /* Correctly handle escaped characters here.
+ * See the XXX'ed section above.
+ */
+ if ((*c == '\\') && (in_quote))
+ {
+ c++;
+ current_value += *c;
+ continue;
+ }
+ if (*c == '"')
{
- if(!in_quote)
+ if (!in_quote)
{
/* We're not already in a quote. */
in_quote = true;