From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Tue, 26 Jun 2018 20:27:15 +0000 (-0400)
Subject: Merge pull request #1287 in SNORT/snort3 from apple_core_media to master
X-Git-Tag: 3.0.0-246~38
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12636d9420e97aa57fae7d22a2b2e03c2dbed664;p=thirdparty%2Fsnort3.git

Merge pull request #1287 in SNORT/snort3 from apple_core_media to master

Squashed commit of the following:

commit 615946c0d6235eeea84e52f31951737fd07f0336
Author: Masud Hasan <mashasan@cisco.com>
Date:   Mon Jun 25 13:19:55 2018 -0400

    appid: Fix identify_user_agent's default case
---

diff --git a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
index 43a1f6b95..0c57faec7 100644
--- a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
+++ b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
@@ -282,7 +282,7 @@ static int match_query_elements(tMlpPattern* packetData, tMlpPattern* userPatter
 
     appVersion[0] = '\0';
 
-    if (!userPattern->pattern || !packetData->pattern)
+    if (!userPattern || !userPattern->pattern || !packetData || !packetData->pattern)
         return 0;
 
     // queryEnd is 1 past the end.  key1=value1&key2=value2
@@ -1405,6 +1405,10 @@ void HttpPatternMatchers::identify_user_agent(const char* start, int size, AppId
             default:
                 if (match->client_id)
                 {
+                    dominant_pattern_detected = 1;
+                    service_id = APP_ID_HTTP;
+                    client_id = match->client_id;
+
                     if (match->pattern_size <= longest_misc_match)
                         break;
                     longest_misc_match = match->pattern_size;
@@ -1430,9 +1434,6 @@ void HttpPatternMatchers::identify_user_agent(const char* start, int size, AppId
                         }
                         temp_ver[i] = 0;
                     }
-                    dominant_pattern_detected = 1;
-                    service_id = APP_ID_HTTP;
-                    client_id = match->client_id;
                 }
             }
         }