From: Amos Jeffries <squid3@treenet.co.nz>
Date: Thu, 4 Dec 2014 16:06:59 +0000 (-0800)
Subject: Fix handling of regex \ characters
X-Git-Tag: merge-candidate-3-v1~460
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8b6865735a9feb705d04d72d365589e5813777d;p=thirdparty%2Fsquid.git

Fix handling of regex \ characters
---

diff --git a/src/ConfigParser.cc b/src/ConfigParser.cc
index 3de6810945..6d1b4bcc35 100644
--- a/src/ConfigParser.cc
+++ b/src/ConfigParser.cc
@@ -269,18 +269,23 @@ ConfigParser::TokenParse(const char * &nextToken, ConfigParser::TokenType &type)
             sep = w_space;
     } else if (ConfigParser::ParseQuotedOrToEol_)
         sep = "\n";
-    else if (!ConfigParser::RecognizeQuotedValues || *nextToken == '(')
-        sep = w_space;
     else if (ConfigParser::RecognizeQuotedPair_)
         sep = w_space "\\";
+    else if (!ConfigParser::RecognizeQuotedValues || *nextToken == '(')
+        sep = w_space;
     else
         sep = w_space "(";
     nextToken += strcspn(nextToken, sep);
 
-    // NP: do not permit \0 terminator to be escaped.
-    while (ConfigParser::RecognizeQuotedPair_ && *nextToken && *(nextToken-1) == '\\') {
-        ++nextToken; // skip the quoted-pair (\-escaped) character
-        nextToken += strcspn(nextToken, sep);
+    while (ConfigParser::RecognizeQuotedPair_ && *nextToken == '\\') {
+        // NP: do not permit \0 terminator to be escaped.
+        if (*(nextToken+1) && *(nextToken+1) != '\r' && *(nextToken+1) != '\n') {
+          nextToken += 2; // skip the quoted-pair (\-escaped) character
+          nextToken += strcspn(nextToken, sep);
+        } else {
+            debugs(3, DBG_CRITICAL, "FATAL: Unescaped '\' character in regex pattern: " << tokenStart);
+            self_destruct();
+        }
     }
 
     if (ConfigParser::RecognizeQuotedValues && *nextToken == '(') {