From: rcombs <rcombs@sq18.sfeng.sourcefire.com>
Date: Fri, 31 Oct 2014 20:45:46 +0000 (-0400)
Subject: fixed parsing of reference with \;
X-Git-Tag: 3.0.0-233~1288^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=876a1d25ec71833c9a192c8a307af9a6e888c2ee;p=thirdparty%2Fsnort3.git

fixed parsing of reference with \;
---

diff --git a/ChangeLog b/ChangeLog
index e68049628..2c93982d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 -- squelch 129:9 and 129:10 if link addrs are swapped
 -- tweaks from Josh
 -- tweaked inspector execution
+-- fixed parsing of reference with \;
 
 126
 -- pulled latest from tom
diff --git a/src/parser/parse_stream.cc b/src/parser/parse_stream.cc
index d6099bd92..5fd3522eb 100644
--- a/src/parser/parse_stream.cc
+++ b/src/parser/parse_stream.cc
@@ -49,7 +49,8 @@ enum TokenType
     TT_MAX
 };
 
-#if 0
+//#define TRACER
+#ifdef TRACER
 static const char* const toks[TT_MAX] =
 {
     "none", "punct", "string", "list", "literal"
@@ -79,7 +80,9 @@ static TokenType get_token(
 
     while ( c != EOF )
     {
-        //printf("state = %d, c = %d\n", state, c);
+#ifdef TRACER
+        printf("state = %d, c = %d\n", state, c);
+#endif
 
         if ( c == '\n' )
         {
@@ -185,7 +188,11 @@ static TokenType get_token(
             state = 0;
             break;
         case 6:  // token
-            if ( isspace(c) || strchr(punct, c) )
+            if ( esc && c == '\\' )
+            {
+                state = 9;
+            }
+            else if ( isspace(c) || strchr(punct, c) )
             {
                 prev = c;
                 return TT_LITERAL;
@@ -223,6 +230,10 @@ static TokenType get_token(
                     state = 1;
             }
             break;
+        case 9:  // token escape
+            s += c;
+            state = 6;
+            break;
         }
         c = is.get();
         chars++;
@@ -290,7 +301,7 @@ static const State fsm[] =
     {  7,  8, TT_PUNCT,   FSM_SOB, "(",        nullptr },
     {  8,  0, TT_PUNCT,   FSM_EOB, ")",        nullptr },
     {  8, 13, TT_LITERAL, FSM_KEY, "metadata", nullptr },
-    {  8, 13, TT_LITERAL, FSM_KEY, "reference",":,;"   },
+    {  8, 16, TT_LITERAL, FSM_KEY, "reference",":;"    },
     {  8,  9, TT_LITERAL, FSM_KEY, nullptr,    nullptr },
     {  9,  8, TT_PUNCT,   FSM_END, ";",        nullptr },
     {  9, 10, TT_PUNCT,   FSM_NOP, ":",        nullptr },
@@ -313,6 +324,7 @@ static const State fsm[] =
     { 14, 14, TT_NONE,    FSM_SET, ",",        nullptr },
     { 14, 14, TT_NONE,    FSM_ADD, nullptr,    nullptr },
     { 15,  0, TT_LITERAL, FSM_INC, nullptr,    nullptr },
+    { 16, 14, TT_PUNCT,   FSM_NOP, ":",        ";"     },
 };
 
 static const State* get_state(int num, TokenType type, const string& tok)
@@ -480,7 +492,7 @@ static void parse_body(const char* extra, RuleParseState& rps, struct SnortConfi
         exec(s->action, tok, rps, sc);
 
         num = s->next;
-        esc = (rps.key == "pcre");
+        esc = (rps.key == "pcre" || rps.key == "reference");
 
         if ( s->punct )
             punct = s->punct;
@@ -502,14 +514,16 @@ void parse_stream(istream& is, struct SnortConfig* sc)
         ++tokens;
         const State* s = get_state(num, type, tok);
 
-        //printf("%d: %s = '%s' -> %s\n",
-        //    num, toks[type], tok.c_str(), acts[s->action]);
+#ifdef TRACER
+        printf("%d: %s = '%s' -> %s\n",
+            num, toks[type], tok.c_str(), acts[s->action]);
+#endif
 
         if ( exec(s->action, tok, rps, sc) )
             break;
 
         num = s->next;
-        esc = (rps.key == "pcre");
+        esc = (rps.key == "pcre" || rps.key == "reference");
 
         if ( s->punct )
             punct = s->punct;