From: Victor Julien <victor@inliniac.net>
Date: Fri, 6 May 2016 09:04:29 +0000 (+0200)
Subject: decode-mime: don't call memcpy on NULL pointer
X-Git-Tag: suricata-3.1RC1~192
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c64815e4a892a78cc4cc1a0bfe1b25f6b1a24216;p=thirdparty%2Fsuricata.git

decode-mime: don't call memcpy on NULL pointer
---

diff --git a/src/util-decode-mime.c b/src/util-decode-mime.c
index 60206c20e3..01cb28fb14 100644
--- a/src/util-decode-mime.c
+++ b/src/util-decode-mime.c
@@ -1210,7 +1210,9 @@ static uint8_t ProcessBase64Remainder(const uint8_t *buf, uint32_t len,
     /* Fill in block with first few bytes of current line */
     remainder = B64_BLOCK - state->bvr_len;
     remainder = remainder < len ? remainder : len;
-    memcpy(state->bvremain + state->bvr_len, buf, remainder);
+    if (remainder && buf) {
+        memcpy(state->bvremain + state->bvr_len, buf, remainder);
+    }
     state->bvr_len += remainder;
 
     /* If data chunk buffer will be full, then clear it now */