From: Victor Julien <victor@inliniac.net>
Date: Fri, 9 Oct 2015 14:21:17 +0000 (+0200)
Subject: ac-ks: fix mem leaks
X-Git-Tag: suricata-3.1RC1~393
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c2e374a3d5115bc392164fd567b3afd9b5502d0;p=thirdparty%2Fsuricata.git

ac-ks: fix mem leaks
---

diff --git a/src/util-mpm-ac-tile.c b/src/util-mpm-ac-tile.c
index 1fb43e9d59..025335d3ef 100644
--- a/src/util-mpm-ac-tile.c
+++ b/src/util-mpm-ac-tile.c
@@ -305,6 +305,12 @@ static void SCACTileFreePattern(MpmCtx *mpm_ctx, SCACTilePattern *p)
         mpm_ctx->memory_size -= p->len;
     }
 
+    if (p != NULL && p->sids != NULL) {
+        SCFree(p->sids);
+        mpm_ctx->memory_cnt--;
+        mpm_ctx->memory_size -= (p->sids_size * sizeof(SigIntId));
+    }
+
     if (p != NULL) {
         SCFree(p);
         mpm_ctx->memory_cnt--;
@@ -1165,9 +1171,11 @@ static void SCACTilePrepareSearch(MpmCtx *mpm_ctx)
     /* TODO: Could be made more compact */
     search_ctx->output_table = ctx->output_table;
     ctx->output_table = NULL;
+    search_ctx->state_count = ctx->state_count;
 
     search_ctx->pattern_list = ctx->pattern_list;
     ctx->pattern_list = NULL;
+    search_ctx->pattern_cnt = mpm_ctx->pattern_cnt;
 
     /* One bit per pattern, rounded up to the next byte size. */
     search_ctx->mpm_bitarray_size = (mpm_ctx->pattern_cnt + 7) / 8;
@@ -1260,6 +1268,8 @@ int SCACTilePreparePatterns(MpmCtx *mpm_ctx)
         /* ACPatternList now owns this memory */
         ctx->pattern_list[i].sids_size = ctx->parray[i]->sids_size;
         ctx->pattern_list[i].sids = ctx->parray[i]->sids;
+        ctx->parray[i]->sids = NULL;
+        ctx->parray[i]->sids_size = 0;
     }
 
     /* prepare the state table required by AC */
@@ -1434,8 +1444,25 @@ void SCACTileDestroyCtx(MpmCtx *mpm_ctx)
 
     /* Free Search tables */
     SCFree(search_ctx->state_table);
-    SCFree(search_ctx->pattern_list);
-    SCFree(search_ctx->output_table);
+
+    if (search_ctx->pattern_list != NULL) {
+        uint32_t i;
+        for (i = 0; i < search_ctx->pattern_cnt; i++) {
+            if (search_ctx->pattern_list[i].sids != NULL)
+                SCFree(search_ctx->pattern_list[i].sids);
+        }
+        SCFree(search_ctx->pattern_list);
+    }
+
+    if (search_ctx->output_table != NULL) {
+        uint32_t state;
+        for (state = 0; state < search_ctx->state_count; state++) {
+            if (search_ctx->output_table[state].patterns != NULL) {
+                SCFree(search_ctx->output_table[state].patterns);
+            }
+        }
+        SCFree(search_ctx->output_table);
+    }
 
     SCFree(search_ctx);
     mpm_ctx->ctx = NULL;
diff --git a/src/util-mpm-ac-tile.h b/src/util-mpm-ac-tile.h
index 63d5bc95ef..a0d7857147 100644
--- a/src/util-mpm-ac-tile.h
+++ b/src/util-mpm-ac-tile.h
@@ -156,6 +156,11 @@ typedef struct SCACTileSearchCtx_ {
     /* Number of bytes in the array of bits. One bit per pattern in this MPM. */
     uint32_t mpm_bitarray_size;
 
+    /* Number of states used by ac-tile */
+    uint32_t state_count;
+
+    uint32_t pattern_cnt;
+
     /* MPM Creation data, only used at initialization. */
     SCACTileCtx *init_ctx;