From: Victor Julien <victor@inliniac.net>
Date: Sat, 17 Jan 2015 09:57:02 +0000 (+0100)
Subject: Fix live reload detect thread ctx setup
X-Git-Tag: suricata-2.1beta3~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62751c801794ad36ce21824604e98843f68cfe8e;p=thirdparty%2Fsuricata.git

Fix live reload detect thread ctx setup

Code failed to setup non_mpm_id_array in case of a live reload.
---

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 8f8cc2095d..211d330f56 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -1290,6 +1290,9 @@ static TmEcode ThreadCtxDoInit (DetectEngineCtx *de_ctx, DetectEngineThreadCtx *
         PmqSetup(&det_ctx->smsg_pmq[i], de_ctx->max_fp_id);
     }
 
+    det_ctx->non_mpm_id_array =  SCCalloc(32000, sizeof(SigIntId)); // TODO proper size or dynamicly grow
+    BUG_ON(det_ctx->non_mpm_id_array == NULL);
+
     /* IP-ONLY */
     DetectEngineIPOnlyThreadInit(de_ctx,&det_ctx->io_ctx);
 
@@ -1379,9 +1382,6 @@ TmEcode DetectEngineThreadCtxInit(ThreadVars *tv, void *initdata, void **data)
     det_ctx->tv = tv;
     det_ctx->de_ctx = de_ctx;
 
-    det_ctx->non_mpm_id_array =  SCCalloc(32000, sizeof(SigIntId)); // TODO proper size or dynamicly grow
-    BUG_ON(det_ctx->non_mpm_id_array == NULL);
-
     if (ThreadCtxDoInit(de_ctx, det_ctx) != TM_ECODE_OK)
         return TM_ECODE_FAILED;