[FFmpeg-devel] [PATCH]lavf/mov: Only copy extradata if it exists.

[Carl Eugen Hoyos]

Hi!

Attached patch fixes an ubsan warning like the following here:
libavformat/mov.c:2332:13: runtime error: null pointer passed as argument 2, 
which is declared to never be null

Please comment, Carl Eugen
-------------- next part --------------
From b117fdd2adf3271fcaf8f9388866aaf115284f74 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos at ag.or.at>
Date: Tue, 18 Apr 2017 10:56:31 +0200
Subject: [PATCH] lavf/mov: Only copy extradata if it exists.

Avoids undefined call of memcpy(ptr, NULL, 0);
---
 libavformat/mov.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2995a00..03fd90e 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2321,7 +2321,7 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
         } else if (a.size > 0)
             avio_skip(pb, a.size);
 
-        if (sc->extradata) {
+        if (sc->extradata && st->codecpar->extradata) {
             int extra_size = st->codecpar->extradata_size;
 
             /* Move the current stream extradata to the stream context one. */
-- 
1.7.10.4