From: Ken Steele <ken@tilera.com>
Date: Fri, 7 Nov 2014 15:52:08 +0000 (-0500)
Subject: fix check in PmqMerge
X-Git-Tag: suricata-2.1beta3~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eaac9c8d938b5d898813438505429e2da1562e62;p=thirdparty%2Fsuricata.git

fix check in PmqMerge
---

diff --git a/src/util-mpm.c b/src/util-mpm.c
index 9a3da161d0..157eb58700 100644
--- a/src/util-mpm.c
+++ b/src/util-mpm.c
@@ -591,7 +591,9 @@ void PmqMerge(PatternMatcherQueue *src, PatternMatcherQueue *dst)
 
     /** \todo now set merged flag? */
 
-    MpmAddSids(dst, src->rule_id_array, src->rule_id_array_cnt);
+    if (src->rule_id_array && dst->rule_id_array) {
+        MpmAddSids(dst, src->rule_id_array, src->rule_id_array_cnt);
+    }
 }
 
 /** \brief Reset a Pmq for reusage. Meant to be called after a single search.