Merge pull request #862 from wazuh/fix_leaks

Fixed some memory leaks at analysisd

Author: ddpbsd

src/analysisd/decoders/decode-xml.c

@@ -100,7 +100,8 @@ static int os_setdecoderids(const char *p_name)
                 nnode->id = p_id;
 
                 /* Set parent name */
-                nnode->name = tmp_name;
+                free(nnode->name);
+                nnode->name = strdup(tmp_name);
             }
 
             /* Id cannot be 0 */
@@ -203,12 +204,14 @@ int ReadDecodeXML(const char *file)
     }
 
     /* Zero NULL_decoder */
-    os_calloc(1, sizeof(OSDecoderInfo), NULL_Decoder_tmp);
-    NULL_Decoder_tmp->id = 0;
-    NULL_Decoder_tmp->type = SYSLOG;
-    NULL_Decoder_tmp->name = NULL;
-    NULL_Decoder_tmp->fts = 0;
-    NULL_Decoder = NULL_Decoder_tmp;
+    if (!NULL_Decoder) {
+        os_calloc(1, sizeof(OSDecoderInfo), NULL_Decoder_tmp);
+        NULL_Decoder_tmp->id = 0;
+        NULL_Decoder_tmp->type = SYSLOG;
+        NULL_Decoder_tmp->name = NULL;
+        NULL_Decoder_tmp->fts = 0;
+        NULL_Decoder = NULL_Decoder_tmp;
+    }
 
     i = 0;
     while (node[i]) {
@@ -751,4 +754,3 @@ char *_loadmemory(char *at, char *str)
     }
     return (NULL);
 }
-

src/analysisd/rules.c

@@ -1117,6 +1117,7 @@ int Rules_OP_ReadRules(const char *rulefile)
                     free(if_matched_regex);
                     if_matched_regex = NULL;
                 }
+                OS_ClearNode(rule_opt);
             } /* end of elements block */
 
             /* Assign an active response to the rule */
@@ -1761,4 +1762,3 @@ static int doesRuleExist(int sid, RuleNode *r_node)
 
     return (0);
 }
-

src/config/rules-config.c

@@ -174,6 +174,7 @@ int Read_Rules(XML_NODE node, void *configp, __attribute__((unused)) void *mailp
                     }
                 }
 
+                OSRegex_FreePattern(&regex);
                 closedir(dfd);
                 /* Sort just then newly added items */
                 qsort(Config->decoders + start_point , decoders_size - start_point - 1, sizeof(char *), cmpr);
@@ -242,6 +243,7 @@ int Read_Rules(XML_NODE node, void *configp, __attribute__((unused)) void *mailp
                     }
                 }
 
+                OSRegex_FreePattern(&regex);
                 closedir(dfd);
                 /* Sort just then newly added items */
                 qsort(Config->includes + start_point , rules_size - start_point - 1, sizeof(char *), cmpr);
@@ -255,4 +257,3 @@ int Read_Rules(XML_NODE node, void *configp, __attribute__((unused)) void *mailp
     }
     return (0);
 }
-

src/shared/store_op.c

@@ -346,6 +346,7 @@ int OSStore_Put(OSStore *list, const char *key, void *data)
             if ((chk_rc = strcmp(list->cur_node->key, key)) >= 0) {
                 /* Duplicate entry */
                 if (chk_rc == 0) {
+                    free(newnode->key);
                     free(newnode);
                     return (1);
                 }
@@ -380,4 +381,3 @@ int OSStore_Put(OSStore *list, const char *key, void *data)
 
     return (1);
 }
-