]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
Fix tests that didn't expect radix to be freed
authorVictor Julien <victor@inliniac.net>
Thu, 26 Sep 2013 16:33:33 +0000 (18:33 +0200)
committerVictor Julien <victor@inliniac.net>
Thu, 26 Sep 2013 16:33:33 +0000 (18:33 +0200)
src/app-layer-htp.c
src/detect-engine-iponly.c

index c22b96a3f8068ad236811e8f2256a313326be5d1..9fa736140281be980d06171c9f2b3ed1bafda9fe 100644 (file)
@@ -1855,6 +1855,7 @@ void HTPFreeConfig(void)
 
     HTPCfgRec *nextrec = cfglist.next;
     SCRadixReleaseRadixTree(cfgtree);
+    cfgtree = NULL;
     htp_config_destroy(cfglist.cfg);
     while (nextrec != NULL) {
         HTPCfgRec *htprec = nextrec;
index d4c23c088ea12545340f0197b66b96c1bf8cff13..d22d339f37978d658e5c2b9d0d0704dfa13831ea 100644 (file)
@@ -899,19 +899,22 @@ void IPOnlyDeinit(DetectEngineCtx *de_ctx, DetectEngineIPOnlyCtx *io_ctx) {
 
     if (io_ctx->tree_ipv4src != NULL)
         SCRadixReleaseRadixTree(io_ctx->tree_ipv4src);
+    io_ctx->tree_ipv4src = NULL;
 
     if (io_ctx->tree_ipv4dst != NULL)
         SCRadixReleaseRadixTree(io_ctx->tree_ipv4dst);
+    io_ctx->tree_ipv4dst = NULL;
 
     if (io_ctx->tree_ipv6src != NULL)
         SCRadixReleaseRadixTree(io_ctx->tree_ipv6src);
+    io_ctx->tree_ipv6src = NULL;
 
     if (io_ctx->tree_ipv6dst != NULL)
         SCRadixReleaseRadixTree(io_ctx->tree_ipv6dst);
+    io_ctx->tree_ipv6dst = NULL;
 
     if (io_ctx->sig_init_array)
         SCFree(io_ctx->sig_init_array);
-
     io_ctx->sig_init_array = NULL;
 }