From: Victor Julien <victor@inliniac.net>
Date: Fri, 6 May 2016 10:54:37 +0000 (+0200)
Subject: decode: don't call memcpy on NULL-ptr on pseudo packets
X-Git-Tag: suricata-3.1RC1~187
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=001e87310d8e2b366934abc7d57b8248f323f2cc;p=thirdparty%2Fsuricata.git

decode: don't call memcpy on NULL-ptr on pseudo packets
---

diff --git a/src/decode.c b/src/decode.c
index 1b73722e3a..345cb6cdae 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -347,7 +347,9 @@ Packet *PacketDefragPktSetup(Packet *parent, uint8_t *pkt, uint16_t len, uint8_t
         p->root = parent;
 
     /* copy packet and set lenght, proto */
-    PacketCopyData(p, pkt, len);
+    if (pkt && len) {
+        PacketCopyData(p, pkt, len);
+    }
     p->recursion_level = parent->recursion_level; /* NOT incremented */
     p->ts.tv_sec = parent->ts.tv_sec;
     p->ts.tv_usec = parent->ts.tv_usec;