From: Brandon Stultz (brastult) <brastult@cisco.com>
Date: Mon, 25 Nov 2024 12:54:06 +0000 (+0000)
Subject: Pull request #4516: http_inspect: remove semicolon http_param delimiter
X-Git-Tag: 3.6.0.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e952b3116c1a04acb805da02d646362b4fe8e46a;p=thirdparty%2Fsnort3.git

Pull request #4516: http_inspect: remove semicolon http_param delimiter

Merge in SNORT/snort3 from ~BRASTULT/snort3:http_param_delim to master

Squashed commit of the following:

commit bc450cd810193622688ffd750c6feda501215f8d
Author: Brandon Stultz <brastult@cisco.com>
Date:   Mon Nov 11 13:58:30 2024 -0500

    http_inspect: remove semicolon http_param delimiter
---

diff --git a/src/service_inspectors/http_inspect/http_query_parser.cc b/src/service_inspectors/http_inspect/http_query_parser.cc
index 5ee5eae4d..9832f479c 100644
--- a/src/service_inspectors/http_inspect/http_query_parser.cc
+++ b/src/service_inspectors/http_inspect/http_query_parser.cc
@@ -148,8 +148,6 @@ bool HttpQueryParser::parse_key(Parameter& p)
 
 bool HttpQueryParser::parse_value(Parameter& p)
 {
-    const uint8_t* amp;
-    const uint8_t* semi;
     const uint8_t* term;
 
     if ( index >= buffer_len )
@@ -160,15 +158,7 @@ bool HttpQueryParser::parse_value(Parameter& p)
     unsigned remaining = buffer_len - index;
 
     // locate delimiter
-    amp = (const uint8_t*)memchr(p.value, '&', remaining);
-    semi = (const uint8_t*)memchr(p.value, ';', remaining);
-
-    if ( amp && !semi )
-        term = amp;
-    else if ( !amp && semi )
-        term = semi;
-    else
-        term = (amp < semi) ? amp : semi;
+    term = (const uint8_t*)memchr(p.value, '&', remaining);
 
     if ( !term )
     {