CVE-2018-14394

Origin: https://github.com/FFmpeg/FFmpeg/commit/3a2d21bc5f97aa0161db3ae731fc2732be6108b8

Gbp-Pq: Name CVE-2018-14394.patch

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index e48a3634afa2710803d71a8b99ad8c9d96f8f85a..6d99a0a30fa9a9367836d606280d64c6bac97d87 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3033,6 +3033,11 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt)
     else
         samples_in_chunk = 1;
 
+    if (samples_in_chunk < 1) {
+        av_log(s, AV_LOG_ERROR, "fatal error, input packet contains no samples\n");
+        return AVERROR_PATCHWELCOME;
+    }
+
     /* copy extradata if it exists */
     if (trk->vos_len == 0 && enc->extradata_size > 0) {
         trk->vos_len  = enc->extradata_size;