diff mbox

[FFmpeg-devel,2/2,v2] mpegtsenc: Don't pass NULL to memcpy

Message ID 20170706185554.3529-1-derek.buitenhuis@gmail.com
State Accepted
Commit fde9013ab42411ee2015811c28e8921828a81702
Headers show

Commit Message

Derek Buitenhuis July 6, 2017, 6:55 p.m. UTC 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
---
 libavformat/mpegtsenc.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Michael Niedermayer July 7, 2017, 12:44 a.m. UTC | #1 
On Thu, Jul 06, 2017 at 07:55:54PM +0100, Derek Buitenhuis wrote:
> Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
> ---
>  libavformat/mpegtsenc.c | 4 ++++
>  1 file changed, 4 insertions(+)

LGTM

thx

[...]
diff mbox

Patch

diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c
index acea2e93a6..fdfa544ee2 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;