Merge pull request #592 in SNORT/snort3 from app_str to master

Squashed commit of the following:

commit 5a81c23e62b9ded08e5a36f4083b2b93136ffb1e
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Aug 15 09:51:29 2016 -0400

    convert to snort_strndup for proper tracking

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 db6a4f8faf2bcd4601f80e6716c2546fe764da9e..af273c43d873b5c7c93b89884c280e75db1ae76c 100644 (file)
--- a/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
+++ b/src/network_inspectors/appid/detector_plugins/http_url_patterns.cc
@@ -157,12 +157,9 @@ uint32_t parseMultipleHTTPPatterns(const char* pattern, tMlmpPattern* parts, uin
         const char* tmp2 = strstr(tmp, FP_OPERATION_AND);
         if (tmp2)
         {
-            parts[partNum].pattern = (uint8_t*)strndup(tmp, tmp2-tmp);
-            if (parts[partNum].pattern)
-            {
-                parts[partNum].patternSize = strlen((const char*)parts[partNum].pattern);
-                tmp = tmp2+strlen(FP_OPERATION_AND);
-            }
+            parts[partNum].pattern = (uint8_t*)snort_strndup(tmp, tmp2-tmp);
+            parts[partNum].patternSize = strlen((const char*)parts[partNum].pattern);
+            tmp = tmp2+strlen(FP_OPERATION_AND);
         }
         else
         {