From: Russ Combs <rucombs@cisco.com>
Date: Wed, 19 Nov 2014 21:57:14 +0000 (-0500)
Subject: gak
X-Git-Tag: 3.0.0-233~1189^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d84171c366b9f2c35d25e1c3c297cdb3cfda4b77;p=thirdparty%2Fsnort3.git

gak
---

diff --git a/src/main/snort_config.cc b/src/main/snort_config.cc
index 6b2eda490..4efedb730 100644
--- a/src/main/snort_config.cc
+++ b/src/main/snort_config.cc
@@ -208,7 +208,8 @@ SnortConfig * SnortConfNew(void)
 
     sc->var_list = NULL;
 
-    sc->state = (SnortState*)SnortAlloc(sizeof(SnortState)*get_instance_max());
+    sc->num_slots = get_instance_max();
+    sc->state = (SnortState*)SnortAlloc(sizeof(SnortState)*sc->num_slots);
 
     sc->policy_map = new PolicyMap;
 
@@ -537,8 +538,8 @@ SnortConfig* MergeSnortConfs(SnortConfig *cmd_line, SnortConfig *config_file)
     config_file->var_list = NULL;
 
     free(config_file->state);
-    config_file->state = (SnortState*)SnortAlloc(
-        sizeof(SnortState)*get_instance_max());
+    config_file->num_slots = get_instance_max();
+    config_file->state = (SnortState*)SnortAlloc(sizeof(SnortState)*config_file->num_slots);
 
     return config_file;
 }