From 0e4235cc94a260b99c426479c8171bbdc8e56b92 Mon Sep 17 00:00:00 2001 From: William Metcalf Date: Wed, 16 Jun 2010 15:36:32 -0500 Subject: [PATCH] FLOW_DESTROY added to clean-up UT's that init flow --- src/app-layer-dcerpc.c | 5 +++++ src/app-layer-ftp.c | 6 ++++++ src/app-layer-parser.c | 3 +++ src/app-layer-ssl.c | 5 +++++ src/detect-dce-iface.c | 3 +++ src/detect-dce-opnum.c | 7 +++++++ src/detect-dce-stub-data.c | 5 +++++ src/detect-engine-state.c | 4 ++-- src/detect-flowbits.c | 8 +++++++- src/detect-ftpbounce.c | 3 +++ src/detect-http-client-body.c | 9 +++++++++ src/detect-http-header.c | 9 +++++++++ src/detect-http-method.c | 4 ++++ src/detect-pcre.c | 5 +++++ src/detect-tls-version.c | 4 ++++ src/detect-uricontent.c | 19 +++++++++++++------ src/detect-urilen.c | 2 ++ src/detect.c | 12 ++++++++++++ src/flow.c | 17 ++++++++--------- 19 files changed, 112 insertions(+), 18 deletions(-) diff --git a/src/app-layer-dcerpc.c b/src/app-layer-dcerpc.c index 9a670cbd3f..335fb13f8d 100644 --- a/src/app-layer-dcerpc.c +++ b/src/app-layer-dcerpc.c @@ -36,6 +36,8 @@ #include "flow-util.h" +#include "detect-engine-state.h" + #include "stream-tcp-private.h" #include "stream-tcp-reassemble.h" #include "stream-tcp.h" @@ -1886,6 +1888,7 @@ int DCERPCParserTest01(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2079,6 +2082,7 @@ int DCERPCParserTest02(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2265,6 +2269,7 @@ int DCERPCParserTest03(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/app-layer-ftp.c b/src/app-layer-ftp.c index ef05f0e53d..cead71e42e 100644 --- a/src/app-layer-ftp.c +++ b/src/app-layer-ftp.c @@ -33,6 +33,8 @@ #include "flow-util.h" +#include "detect-engine-state.h" + #include "stream-tcp-private.h" #include "stream-tcp-reassemble.h" #include "stream-tcp.h" @@ -326,6 +328,7 @@ int FTPParserTest01(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -428,6 +431,7 @@ int FTPParserTest06(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -480,6 +484,7 @@ int FTPParserTest07(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -533,6 +538,7 @@ int FTPParserTest10(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } #endif /* UNITTESTS */ diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c index 11b12e066e..e9aae2678a 100644 --- a/src/app-layer-parser.c +++ b/src/app-layer-parser.c @@ -34,6 +34,8 @@ #include "flow-util.h" +#include "detect-engine-state.h" + #include "stream-tcp.h" #include "stream-tcp-private.h" #include "stream.h" @@ -1353,6 +1355,7 @@ static int AppLayerParserTest01 (void) end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/app-layer-ssl.c b/src/app-layer-ssl.c index 9e4e0b605f..3f172bf8be 100644 --- a/src/app-layer-ssl.c +++ b/src/app-layer-ssl.c @@ -37,6 +37,8 @@ #include "stream-tcp.h" #include "stream.h" +#include "detect-engine-state.h" + #include "app-layer-protos.h" #include "app-layer-parser.h" @@ -298,6 +300,7 @@ static int SSLParserTest01(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -353,6 +356,7 @@ static int SSLParserTest02(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -689,6 +693,7 @@ static int SSLParserTest03(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } #endif /* UNITTESTS */ diff --git a/src/detect-dce-iface.c b/src/detect-dce-iface.c index 88f4226fc1..f68fb0a515 100644 --- a/src/detect-dce-iface.c +++ b/src/detect-dce-iface.c @@ -30,6 +30,7 @@ #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "detect-dce-iface.h" #include "flow.h" @@ -926,6 +927,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1372,6 +1374,7 @@ static int DetectDceIfaceTestParse14(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-dce-opnum.c b/src/detect-dce-opnum.c index 3e99a83445..303bd883c6 100644 --- a/src/detect-dce-opnum.c +++ b/src/detect-dce-opnum.c @@ -30,6 +30,7 @@ #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "flow.h" #include "flow-var.h" @@ -1210,6 +1211,7 @@ static int DetectDceOpnumTestParse08(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1718,6 +1720,7 @@ static int DetectDceOpnumTestParse09(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2023,6 +2026,7 @@ static int DetectDceOpnumTestParse10(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2273,6 +2277,7 @@ static int DetectDceOpnumTestParse11(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2574,6 +2579,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -2820,6 +2826,7 @@ static int DetectDceOpnumTestParse13(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } #endif diff --git a/src/detect-dce-stub-data.c b/src/detect-dce-stub-data.c index ceb6c93115..53d255342e 100644 --- a/src/detect-dce-stub-data.c +++ b/src/detect-dce-stub-data.c @@ -30,6 +30,7 @@ #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "flow.h" #include "flow-var.h" @@ -732,6 +733,7 @@ static int DetectDceStubDataTestParse02(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1240,6 +1242,7 @@ static int DetectDceStubDataTestParse03(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1519,6 +1522,7 @@ static int DetectDceStubDataTestParse04(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1758,6 +1762,7 @@ static int DetectDceStubDataTestParse05(void) FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-engine-state.c b/src/detect-engine-state.c index 8ce76bcb3f..45fba3de32 100644 --- a/src/detect-engine-state.c +++ b/src/detect-engine-state.c @@ -821,6 +821,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -990,8 +991,6 @@ static int DeStateSigTest02(void) { result = 1; end: - FLOW_DESTROY(&f); - if (det_ctx != NULL) { DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); } @@ -1002,6 +1001,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } #endif diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c index a4e500e5b2..ceda4c147d 100644 --- a/src/detect-flowbits.c +++ b/src/detect-flowbits.c @@ -37,6 +37,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "flow-bit.h" #include "util-var-name.h" @@ -761,6 +762,7 @@ static int FlowBitsTestSig06(void) { DetectEngineCtxFree(de_ctx); if(gv) GenericVarFree(gv); + FLOW_DESTROY(&f); return result; end: @@ -779,7 +781,7 @@ end: } if(gv) GenericVarFree(gv); - + FLOW_DESTROY(&f); return result; } @@ -861,6 +863,7 @@ static int FlowBitsTestSig07(void) { DetectEngineCtxFree(de_ctx); if(gv) GenericVarFree(gv); + FLOW_DESTROY(&f); return result; end: @@ -879,6 +882,7 @@ end: } if(gv) GenericVarFree(gv); + FLOW_DESTROY(&f); return result; } @@ -963,6 +967,7 @@ static int FlowBitsTestSig08(void) { DetectEngineCtxFree(de_ctx); if(gv) GenericVarFree(gv); + FLOW_DESTROY(&f); return result; end: @@ -981,6 +986,7 @@ end: } if(gv) GenericVarFree(gv); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-ftpbounce.c b/src/detect-ftpbounce.c index b736ff6e33..d710b827cd 100644 --- a/src/detect-ftpbounce.c +++ b/src/detect-ftpbounce.c @@ -30,6 +30,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "detect-content.h" #include "app-layer.h" @@ -427,6 +428,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -554,6 +556,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-http-client-body.c b/src/detect-http-client-body.c index 5955097a90..41d0de5fb9 100644 --- a/src/detect-http-client-body.c +++ b/src/detect-http-client-body.c @@ -31,6 +31,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "detect-content.h" #include "flow.h" @@ -534,6 +535,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -663,6 +665,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -793,6 +796,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -923,6 +927,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1053,6 +1058,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1154,6 +1160,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1255,6 +1262,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1356,6 +1364,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-http-header.c b/src/detect-http-header.c index 1bd6e903d7..fd79f90a53 100644 --- a/src/detect-http-header.c +++ b/src/detect-http-header.c @@ -31,6 +31,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "detect-content.h" #include "flow.h" @@ -529,6 +530,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -657,6 +659,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -784,6 +787,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -912,6 +916,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1040,6 +1045,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1140,6 +1146,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1240,6 +1247,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1341,6 +1349,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-http-method.c b/src/detect-http-method.c index 5a3f4d2d8a..423689274e 100644 --- a/src/detect-http-method.c +++ b/src/detect-http-method.c @@ -32,6 +32,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "detect-content.h" #include "flow.h" @@ -488,6 +489,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -591,6 +593,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -680,6 +683,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-pcre.c b/src/detect-pcre.c index 7e801eb582..a7863ee8aa 100644 --- a/src/detect-pcre.c +++ b/src/detect-pcre.c @@ -38,6 +38,7 @@ #include "detect-parse.h" #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "util-var-name.h" #include "util-unittest-helper.h" @@ -1224,6 +1225,7 @@ static int DetectPcreTestSig01Real(int mpm_type) { DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); DetectEngineCtxFree(de_ctx); + FLOW_DESTROY(&f); end: return result; } @@ -1285,6 +1287,7 @@ static int DetectPcreTestSig02Real(int mpm_type) { DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); DetectEngineCtxFree(de_ctx); + FLOW_DESTROY(&f); end: return result; } @@ -1497,6 +1500,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1659,6 +1663,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-tls-version.c b/src/detect-tls-version.c index ab843ccee3..3c2ddd1445 100644 --- a/src/detect-tls-version.c +++ b/src/detect-tls-version.c @@ -33,6 +33,7 @@ #include "detect-engine.h" #include "detect-engine-mpm.h" +#include "detect-engine-state.h" #include "flow.h" #include "flow-var.h" @@ -420,6 +421,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -534,6 +536,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -664,6 +667,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect-uricontent.c b/src/detect-uricontent.c index 3b8e7a62a7..b99c5bce49 100644 --- a/src/detect-uricontent.c +++ b/src/detect-uricontent.c @@ -32,6 +32,7 @@ #include "detect-engine-mpm.h" #include "detect-parse.h" #include "detect-engine.h" +#include "detect-engine-state.h" #include "flow.h" #include "detect-flow.h" #include "flow-var.h" @@ -527,6 +528,7 @@ static int HTTPUriTest01(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -596,8 +598,8 @@ static int HTTPUriTest02(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); - if (htp_state == NULL) - HTPStateFree(htp_state); + if (htp_state != NULL) HTPStateFree(htp_state); + FLOW_DESTROY(&f); return result; } @@ -665,8 +667,8 @@ static int HTTPUriTest03(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); - if (htp_state == NULL) - HTPStateFree(htp_state); + if (htp_state != NULL) HTPStateFree(htp_state); + FLOW_DESTROY(&f); return result; } @@ -736,8 +738,8 @@ static int HTTPUriTest04(void) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); - if (htp_state == NULL) - HTPStateFree(htp_state); + if (htp_state != NULL) HTPStateFree(htp_state); + FLOW_DESTROY(&f); return result; } @@ -893,6 +895,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1027,6 +1030,7 @@ end: //FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1349,6 +1353,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1482,6 +1487,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } @@ -1603,6 +1609,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } #endif /* UNITTESTS */ diff --git a/src/detect-urilen.c b/src/detect-urilen.c index 31d6fb27c0..2b0763c759 100644 --- a/src/detect-urilen.c +++ b/src/detect-urilen.c @@ -30,6 +30,7 @@ #include "detect.h" #include "detect-parse.h" +#include "detect-engine-state.h" #include "detect-urilen.h" #include "util-debug.h" @@ -575,6 +576,7 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } diff --git a/src/detect.c b/src/detect.c index 3b4cadf59b..caf62f29cf 100644 --- a/src/detect.c +++ b/src/detect.c @@ -3513,6 +3513,7 @@ static int SigTest06Real (int mpm_type) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } static int SigTest06B2g (void) { @@ -3604,12 +3605,14 @@ end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); AppLayerParserCleanupState(&f); + FLOW_DESTROY(&f); SigGroupCleanup(de_ctx); SigCleanSignatures(de_ctx); DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); //PatternMatchDestroy(mpm_ctx); DetectEngineCtxFree(de_ctx); + return result; } static int SigTest07B2g (void) { @@ -3710,6 +3713,7 @@ static int SigTest08Real (int mpm_type) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } static int SigTest08B2g (void) { @@ -3806,6 +3810,7 @@ static int SigTest09Real (int mpm_type) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } static int SigTest09B2g (void) { @@ -3897,6 +3902,7 @@ static int SigTest10Real (int mpm_type) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } static int SigTest10B2g (void) { @@ -3974,6 +3980,7 @@ static int SigTest11Real (int mpm_type) { end: FlowL7DataPtrFree(&f); StreamTcpFreeConfig(TRUE); + FLOW_DESTROY(&f); return result; } static int SigTest11B2g (void) { @@ -4041,6 +4048,7 @@ end: SigCleanSignatures(de_ctx); DetectEngineCtxFree(de_ctx); } + FLOW_DESTROY(&f); return result; } static int SigTest12B2g (void) { @@ -4106,6 +4114,7 @@ static int SigTest13Real (int mpm_type) { //PatternMatchDestroy(mpm_ctx); DetectEngineCtxFree(de_ctx); end: + FLOW_DESTROY(&f); return result; } static int SigTest13B2g (void) { @@ -4668,6 +4677,7 @@ static int SigTest21Real (int mpm_type) { //PatternMatchDestroy(mpm_ctx); DetectEngineCtxFree(de_ctx); end: + FLOW_DESTROY(&f); return result; } static int SigTest21B2g (void) { @@ -4760,6 +4770,7 @@ static int SigTest22Real (int mpm_type) { //PatternMatchDestroy(mpm_ctx); DetectEngineCtxFree(de_ctx); end: + FLOW_DESTROY(&f); return result; } static int SigTest22B2g (void) { @@ -4851,6 +4862,7 @@ static int SigTest23Real (int mpm_type) { //PatternMatchDestroy(mpm_ctx); DetectEngineCtxFree(de_ctx); end: + FLOW_DESTROY(&f); return result; } static int SigTest23B2g (void) { diff --git a/src/flow.c b/src/flow.c index 437cb805d1..edf4fe8ce6 100644 --- a/src/flow.c +++ b/src/flow.c @@ -1657,12 +1657,12 @@ static int FlowTest03 (void) { if (FlowTestPrune(&f, &ts) != 1) { SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 0; } SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 1; } @@ -1709,12 +1709,11 @@ static int FlowTest04 (void) { if (FlowTestPrune(&f, &ts) != 1) { SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 0; } - - SCMutexDestroy(&f.m); SCSpinDestroy(&fb.s); + FLOW_DESTROY(&f); return 1; } @@ -1751,12 +1750,12 @@ static int FlowTest05 (void) { if (FlowTestPrune(&f, &ts) != 1) { SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 0; } SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 1; } @@ -1804,12 +1803,12 @@ static int FlowTest06 (void) { if (FlowTestPrune(&f, &ts) != 1) { SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 0; } SCSpinDestroy(&fb.s); - SCMutexDestroy(&f.m); + FLOW_DESTROY(&f); return 1; }