Merge pull request appneta#870 from appneta/Bug_#869_tcpprep_memory_l…

…eak_include_exclude Bug appneta#869 tcpprep memory leak include exclude
fxlb · Jun 5, 2024 · da44ab1 · da44ab1
2 parents d16b027 + a1a4735
commit da44ab1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/.github/workflows/github-actions-ci.yml b/.github/workflows/github-actions-ci.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Create configure script
         run: ./autogen.sh
       - name: configure
-        run: ./configure --with-testnic=eth0 --disable-local-libopts
+        run: ./configure --with-testnic=eth0 --disable-local-libopts --enable-asan
       - name: make
         run: make
       - name: make dist

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
@@ -1,4 +1,5 @@
 06/03/2024 Version 4.5.0-beta1
+    - memory leak in tcpprep when using include/exclude (#869)
     - memory leak in tcpprep when using RegEx (#867)
     - fix nansecond timestamp regression bug (#863)
     - autotools - AC_HELP_STRING is obsolete in 2.70 (#856)

diff --git a/src/tcpprep.c b/src/tcpprep.c
@@ -195,8 +195,6 @@ main(int argc, char *argv[])
     /* close cache file */
     close(out_file);
 
-    regfree(&tcpprep->options->preg);
-
     tcpprep_close(tcpprep);
 
     restore_stdin();

diff --git a/src/tcpprep_api.c b/src/tcpprep_api.c
@@ -91,6 +91,14 @@ tcpprep_close(tcpprep_t *ctx)
         cidr = cidr_nxt;
     }
 
+    if (options->xX.list)
+        free_list(options->xX.list);
+
+    if (options->xX.cidr)
+        safe_free(options->xX.cidr);
+
+    regfree(&options->preg);
+
     safe_free(options);
 
     safe_free(ctx->outfile);