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(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;