From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Mon, 4 Jan 2016 17:59:46 +0000 (-0500)
Subject: Merge pull request #196 in SNORT/snort3 from crc/parse to master
X-Git-Tag: 3.0.0-233~673
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07d82c56022f5044ff9f1a0431aa647c323ec0ca;p=thirdparty%2Fsnort3.git

Merge pull request #196 in SNORT/snort3 from crc/parse to master

Squashed commit of the following:

commit 5b46b26b5f6d1801a2cdf0bc10f529bf2253a538
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Jan 4 12:38:51 2016 -0500

    remove double unescape
---

diff --git a/src/parser/parse_utils.cc b/src/parser/parse_utils.cc
index 3eedfdd81..c00f0d53a 100644
--- a/src/parser/parse_utils.cc
+++ b/src/parser/parse_utils.cc
@@ -71,10 +71,7 @@ bool parse_byte_code(const char* in, bool& negate, std::string& out)
                 ok = false;
             break;
         case 2:
-            if ( c == '\\' )
-                state = 3;
-
-            else if ( c == '|' )
+            if ( c == '|' )
             {
                 hex = 0;
                 nx = 0;
@@ -85,10 +82,6 @@ bool parse_byte_code(const char* in, bool& negate, std::string& out)
             else
                 out += c;
             break;
-        case 3:
-            out += c;
-            state = 2;
-            break;
         case 4:
             if ( c == '|' )
             {