From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 19 Feb 2016 23:21:45 +0000 (-0500)
Subject: Merge pull request #282 in SNORT/snort3 from detection_option_tree_compare_fix to... 
X-Git-Tag: 3.0.0-233~593
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d6f6569f8a3fccb5759cf0f4da152d4bf0a967;p=thirdparty%2Fsnort3.git

Merge pull request #282 in SNORT/snort3 from detection_option_tree_compare_fix to master

Squashed commit of the following:

commit 1199316fa35ca54da8c3d363f05c032cc28e9fda
Author: Victor Roemer <viroemer@cisco.com>
Date:   Fri Feb 19 16:20:18 2016 -0500

    Compare ips options and not the pointers.
---

diff --git a/src/detection/detection_options.cc b/src/detection/detection_options.cc
index 63a59171a..a70a10c35 100644
--- a/src/detection/detection_options.cc
+++ b/src/detection/detection_options.cc
@@ -102,7 +102,7 @@ int detection_option_key_compare_func(const void* k1, const void* k2, size_t)
         IpsOption* opt1 = (IpsOption*)key1->option_data;
         IpsOption* opt2 = (IpsOption*)key2->option_data;
 
-        if ( opt1 == opt2 )
+        if ( *opt1 == *opt2 )
             return DETECTION_OPTION_EQUAL;
     }
     return DETECTION_OPTION_NOT_EQUAL;