]> git.ipfire.org Git - thirdparty/suricata.git/commitdiff
decode-mime: don't call memcpy on NULL pointer
authorVictor Julien <victor@inliniac.net>
Fri, 6 May 2016 09:04:29 +0000 (11:04 +0200)
committerVictor Julien <victor@inliniac.net>
Mon, 9 May 2016 18:31:35 +0000 (20:31 +0200)
src/util-decode-mime.c

index 60206c20e32c0935fca444ae21b031477ece5360..01cb28fb145eb11d08cf85a40268eea92ec69723 100644 (file)
@@ -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 */