unittests: free packet using PacketFree

Update SigTest17 which left a dangling pointer.

diff --git a/src/tests/detect.c b/src/tests/detect.c
index 302666ac853a1321837625b169b6c17eb7a897e5..37dc2cfe9bf75fd74353f29d852f8e8d1ace159a 100644 (file)
--- a/src/tests/detect.c
+++ b/src/tests/detect.c
@@ -1064,14 +1064,11 @@ static int SigTest17 (void)
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
 
     uint32_t capid = VarNameStoreLookupByName("http_host", VAR_TYPE_PKT_VAR);
-
     PktVar *pv_hn = PktVarGet(p, capid);
     FAIL_IF_NULL(pv_hn);
-
     FAIL_IF(pv_hn->value_len != 15);
     FAIL_IF_NOT(memcmp(pv_hn->value, "one.example.org", pv_hn->value_len) == 0);
 
-    PktVarFree(pv_hn);
     DetectEngineThreadCtxDeinit(&th_v, (void *)det_ctx);
     DetectEngineCtxFree(de_ctx);
     ConfDeInit();

diff --git a/src/util-unittest-helper.c b/src/util-unittest-helper.c
index 80356cf82e2b62428e2c4eaf56e2c2313c1be64a..48d2a045c19b4491ef999f306d49bd703764bd0c 100644 (file)
--- a/src/util-unittest-helper.c
+++ b/src/util-unittest-helper.c
@@ -486,28 +486,7 @@ void UTHFreePacket(Packet *p)
 {
     if (p == NULL)
         return;
-#if 0 // VJ we now use one buffer
-    switch (p->proto) {
-        case IPPROTO_UDP:
-            if (p->udph != NULL)
-                SCFree(p->udph);
-            if (p->ip4h != NULL)
-                SCFree(p->ip4h);
-        break;
-        case IPPROTO_TCP:
-            if (p->tcph != NULL)
-                SCFree(p->tcph);
-            if (p->ip4h != NULL)
-                SCFree(p->ip4h);
-        break;
-        case IPPROTO_ICMP:
-            if (p->ip4h != NULL)
-                SCFree(p->ip4h);
-        break;
-        /* TODO: Add more protocols */
-    }
-#endif
-    SCFree(p);
+    PacketFree(p);
 }
 
 void UTHAssignFlow(Packet *p, Flow *f)