From: Mike Stepanek (mstepane) <mstepane@cisco.com>
Date: Fri, 31 Aug 2018 20:25:18 +0000 (-0400)
Subject: Merge pull request #1351 in SNORT/snort3 from valgrind_reputation_init to master
X-Git-Tag: 3.0.0-248~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05d1f46e8e1ceb21c7357dcce5142d0b590de1be;p=thirdparty%2Fsnort3.git

Merge pull request #1351 in SNORT/snort3 from valgrind_reputation_init to master

Squashed commit of the following:

commit 0944be2fb6ec5eed346db9881102dd0396b460e4
Author: Masud Hasan <mashasan@cisco.com>
Date:   Fri Aug 31 15:40:51 2018 -0400

    reputation: Early return on parsing error causing uninitialized id
---

diff --git a/src/network_inspectors/reputation/reputation_inspect.cc b/src/network_inspectors/reputation/reputation_inspect.cc
index 5a80035b4..270a2741d 100644
--- a/src/network_inspectors/reputation/reputation_inspect.cc
+++ b/src/network_inspectors/reputation/reputation_inspect.cc
@@ -329,6 +329,7 @@ private:
 
 Reputation::Reputation(ReputationConfig* pc)
 {
+    reputation_id = create_reputation_id();
     config = *pc;
     ReputationConfig* conf = &config;
     if (!config.list_dir.empty())
@@ -345,7 +346,6 @@ Reputation::Reputation(ReputationConfig* pc)
 
     ip_list_init(conf->num_entries + 1, conf);
     reputationstats.memory_allocated = sfrt_flat_usage(conf->ip_list);
-    reputation_id = create_reputation_id();
 }
 
 bool Reputation::is_reputation_disabled(Flow* flow)