unittests: clean up packet clear logic

pull/7067/head
Victor Julien 4 years ago
parent f07d5b2d89
commit 0437ca61ff

@ -1112,7 +1112,7 @@ void AppLayerDeSetupCounters()
#include "util-unittest.h" #include "util-unittest.h"
#define TEST_START \ #define TEST_START \
Packet *p = SCMalloc(SIZE_OF_PACKET); \ Packet *p = PacketGetFromAlloc(); \
FAIL_IF_NULL(p); \ FAIL_IF_NULL(p); \
Flow f; \ Flow f; \
ThreadVars tv; \ ThreadVars tv; \
@ -1198,8 +1198,7 @@ void AppLayerDeSetupCounters()
StreamTcpSessionClear(p->flow->protoctx); \ StreamTcpSessionClear(p->flow->protoctx); \
StreamTcpThreadDeinit(&tv, (void *)stt); \ StreamTcpThreadDeinit(&tv, (void *)stt); \
StreamTcpFreeConfig(true); \ StreamTcpFreeConfig(true); \
PACKET_DESTRUCTOR(p); \ PacketFree(p); \
SCFree(p); \
FLOW_DESTROY(&f); \ FLOW_DESTROY(&f); \
StatsThreadCleanup(&tv); StatsThreadCleanup(&tv);

@ -555,7 +555,7 @@ static int HostBitsTestSig01(void)
"Host: one.example.org\r\n" "Host: one.example.org\r\n"
"\r\n"; "\r\n";
uint16_t buflen = strlen((char *)buf); uint16_t buflen = strlen((char *)buf);
Packet *p = SCMalloc(SIZE_OF_PACKET); Packet *p = PacketGetFromAlloc();
FAIL_IF_NULL(p); FAIL_IF_NULL(p);
Signature *s = NULL; Signature *s = NULL;
ThreadVars th_v; ThreadVars th_v;
@ -587,9 +587,8 @@ static int HostBitsTestSig01(void)
DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx); DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
DetectEngineCtxFree(de_ctx); DetectEngineCtxFree(de_ctx);
PacketFree(p);
HostBitsTestShutdown(); HostBitsTestShutdown();
SCFree(p);
PASS; PASS;
} }

Loading…
Cancel
Save