From 4071d3cf572a210b9ddb65ece2633b9a81643987 Mon Sep 17 00:00:00 2001
From: Eric Leblond <eric@regit.org>
Date: Wed, 26 Oct 2011 16:16:34 +0200
Subject: [PATCH] PACKET_INITIALIZE is enough for packet init.

---
 src/decode-ipv4.c | 3 ---
 src/stream-tcp.c  | 7 ++-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/decode-ipv4.c b/src/decode-ipv4.c
index 6b95ee327b..2ef62b7c84 100644
--- a/src/decode-ipv4.c
+++ b/src/decode-ipv4.c
@@ -1545,7 +1545,6 @@ int DecodeIPV4DefragTest01(void)
     memset(&tv, 0, sizeof(ThreadVars));
     memset(&dtv, 0, sizeof(DecodeThreadVars));
     memset(&pq, 0, sizeof(PacketQueue));
-    memset(p, 0, sizeof(Packet));
 
     PACKET_INITIALIZE(p);
     FlowInitConfig(FLOW_QUIET);
@@ -1682,7 +1681,6 @@ int DecodeIPV4DefragTest02(void)
     memset(&tv, 0, sizeof(ThreadVars));
     memset(&dtv, 0, sizeof(DecodeThreadVars));
     memset(&pq, 0, sizeof(PacketQueue));
-    memset(p, 0, sizeof(Packet));
 
     PACKET_INITIALIZE(p);
     FlowInitConfig(FLOW_QUIET);
@@ -1817,7 +1815,6 @@ int DecodeIPV4DefragTest03(void)
     memset(&tv, 0, sizeof(ThreadVars));
     memset(&dtv, 0, sizeof(DecodeThreadVars));
     memset(&pq, 0, sizeof(PacketQueue));
-    memset(p, 0, sizeof(Packet));
 
     PACKET_INITIALIZE(p);
     FlowInitConfig(FLOW_QUIET);
diff --git a/src/stream-tcp.c b/src/stream-tcp.c
index cf5c322620..d6fc4644f3 100644
--- a/src/stream-tcp.c
+++ b/src/stream-tcp.c
@@ -8717,10 +8717,8 @@ static int StreamTcpTest40(void) {
     DecodeThreadVars dtv;
 
     memset(&tv, 0, sizeof(ThreadVars));
-    memset(p, 0, SIZE_OF_PACKET);
     PACKET_INITIALIZE(p);
 
-    p->pkt = (uint8_t *)(p + 1);
     SET_PKT_LEN(p, sizeof(raw_vlan));
     memcpy(GET_PKT_DATA(p), raw_vlan, sizeof(raw_vlan));
     memset(&dtv, 0, sizeof(DecodeThreadVars));
@@ -8778,15 +8776,14 @@ static int StreamTcpTest41(void) {
 
     memset(&dtv, 0, sizeof(DecodeThreadVars));
     memset(&tv,  0, sizeof(ThreadVars));
-    memset(p, 0, SIZE_OF_PACKET);
-    p->pkt = (uint8_t *)(p + 1);
+    PACKET_INITIALIZE(p);
 
     if (PacketCopyData(p, raw_ip, sizeof(raw_ip)) == -1) {
+        PACKET_CLEANUP(p);
         SCFree(p);
         return 1;
     }
 
-    PACKET_INITIALIZE(p);
     FlowInitConfig(FLOW_QUIET);
 
     DecodeRaw(&tv, &dtv, p, raw_ip, GET_PKT_LEN(p), NULL);