From b9eb39af8382ee82eb1dff4cd4ed5a2e4f767205 Mon Sep 17 00:00:00 2001
From: Martin Vierula <martin.vierula@trustwave.com>
Date: Wed, 19 Apr 2023 08:13:48 -0700
Subject: [PATCH] Adjust position of memset from 2890

---
 CHANGES               | 2 ++
 src/utils/msc_tree.cc | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index a09587ed1a..62cb945114 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 v3.x.y - YYYY-MMM-DD (to be released)
 -------------------------------------
+  - Adjust position of memset from 2890
+    [Issue #2891 - @mirkodziadzka-avi, @martinhsv]
   - Add test: empty lines in ipMatchFromFile test
     [Issue #2846 - @tomsommer]
 
diff --git a/src/utils/msc_tree.cc b/src/utils/msc_tree.cc
index 167bfa96ad..8e36f274ef 100644
--- a/src/utils/msc_tree.cc
+++ b/src/utils/msc_tree.cc
@@ -258,11 +258,13 @@ int InsertNetmask(TreeNode *node, TreeNode *parent, TreeNode *new_node,
             }
 
             node->count++;
+
             node->netmasks = reinterpret_cast<unsigned char *>(malloc(node->count * sizeof(unsigned char)));
+            if(node->netmasks == NULL) {
+                return 0;
+            }
             memset(node->netmasks, 0, (node->count *  sizeof(unsigned char)));
 
-            if(node->netmasks == NULL)
-                return 0;
             if ((node->count-1) == 0) {
                 node->netmasks[0] = netmask;
                 return 1;