From fde9013ab42411ee2015811c28e8921828a81702 Mon Sep 17 00:00:00 2001
From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Thu, 6 Jul 2017 13:23:06 -0400
Subject: [PATCH] mpegtsenc: Don't pass NULL to memcpy
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
libavformat/mpegtsenc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index acea2e93a64..fdfa544ee26 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -277,6 +277,10 @@ static void putstr8(uint8_t **q_ptr, const char *str, int write_len)
len = strlen(str);
if (write_len)
*q++ = len;
+ if (!str) {
+ *q_ptr = q;
+ return;
+ }
memcpy(q, str, len);
q += len;
*q_ptr = q;
--
GitLab