From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Tue, 23 Feb 2016 18:00:22 +0000 (-0500)
Subject: Merge pull request #286 in SNORT/snort3 from crc/188 to master
X-Git-Tag: 3.0.0-233~589
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f05c7dd48fecdde894e95dbf7f4ea4eb485eb79;p=thirdparty%2Fsnort3.git

Merge pull request #286 in SNORT/snort3 from crc/188 to master

Squashed commit of the following:

commit 72b2a46bfb6860e8323d3a2846b0f72727154ec3
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Feb 23 09:40:17 2016 -0500

    unsanitary address fixes

commit e8ce6491f4567fd5094b1427eb587ae2d360396b
Author: Russ Combs <rucombs@cisco.com>
Date:   Mon Feb 22 16:48:31 2016 -0500

    build 188
---

diff --git a/ChangeLog b/ChangeLog
index ce2b9914f..eb86db357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+16/02/22 - build 188
+
+-- added delete/delete[] replacements for nothrow overload
+   thanks to Ramya Potluri for reporting the issue
+-- fixed a detection option comparison bug which wasted time and space
+-- disable perf_monitor by default since the reporting interval should be set
+-- memory manager updates
+-- valgrind and unsanitary address fixes
+-- snort2lua updates for dce2
+-- build issue fix - make non-GNU strerror_r() the default case
+-- packet latency updates
+-- perfmon updates
+
 16/02/12 - build 187
 
 -- file capture added - initial version writes from packet thread
diff --git a/src/ips_options/ips_flowbits.cc b/src/ips_options/ips_flowbits.cc
index 7d09718c8..91af55838 100644
--- a/src/ips_options/ips_flowbits.cc
+++ b/src/ips_options/ips_flowbits.cc
@@ -235,19 +235,16 @@ bool FlowBitsOption::operator==(const IpsOption& ips) const
         return false;
 
     FlowBitsOption& rhs = (FlowBitsOption&)ips;
-    FLOWBITS_OP* left = (FLOWBITS_OP*)&config;
-    FLOWBITS_OP* right = (FLOWBITS_OP*)&rhs.config;
-    int i;
 
-    if ((left->num_ids != right->num_ids)||
-        (left->eval != right->eval)||
-        (left->type != right->type)||
-        (left->group_id != right->group_id))
+    if ( (config->num_ids != rhs.config->num_ids) or
+        (config->eval != rhs.config->eval) or
+        (config->type != rhs.config->type) or
+        (config->group_id != rhs.config->group_id) )
         return false;
 
-    for (i = 0; i < left->num_ids; i++)
+    for ( int i = 0; i < config->num_ids; i++ )
     {
-        if (left->ids[i] != right->ids[i])
+        if (config->ids[i] != rhs.config->ids[i])
             return false;
     }
 
diff --git a/src/main/build.h b/src/main/build.h
index 7c4c71e3b..297268089 100644
--- a/src/main/build.h
+++ b/src/main/build.h
@@ -10,7 +10,7 @@
 //                                               //
 //-----------------------------------------------//
 
-#define BUILD "187"
+#define BUILD "188"
 
 #endif
 
diff --git a/src/service_inspectors/http_inspect/hi_server_norm.cc b/src/service_inspectors/http_inspect/hi_server_norm.cc
index 2fd45f7c7..aede85020 100644
--- a/src/service_inspectors/http_inspect/hi_server_norm.cc
+++ b/src/service_inspectors/http_inspect/hi_server_norm.cc
@@ -290,6 +290,7 @@ int hi_server_norm(HI_SESSION* session, HttpSessionData* hsd)
 
                 if (angle_bracket > js_start)
                 {
+                    hi_current_search = &hi_html_search[0];
                     script_found = hi_htmltype_search_mpse->find(
                         (const char*)js_start, (angle_bracket-js_start), HI_SearchStrFound);
 
diff --git a/src/stream/flush_bucket.cc b/src/stream/flush_bucket.cc
index ef45a8efb..61fc6eff2 100644
--- a/src/stream/flush_bucket.cc
+++ b/src/stream/flush_bucket.cc
@@ -90,9 +90,10 @@ StaticFlushBucket::StaticFlushBucket()
 
 uint16_t StaticFlushBucket::get_next()
 {
-    uint16_t fp = flush_points[idx];
-    idx = (idx == sizeof(flush_points)) ? 0 : idx + 1;
-    return fp;
+    if ( ++idx >= RAND_FLUSH_POINTS )
+        idx = 0;
+
+    return flush_points[idx];
 }
 
 RandomFlushBucket::RandomFlushBucket()