dirkmueller/ffmpeg-4
SHA256
1
0
Fork 0
forked from pool/ffmpeg-4
Code Pull Requests Activity

- Add 0001-avformat-flvenc-Check-audio-packet-size.patch [CVE-2018-15822, boo#1105869]

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=23
This commit is contained in:
Jan Engelhardt 2018-08-24 07:26:10 +00:00 committed by Git OBS Bridge
parent 019507f81a
commit 07f3304fcc
3 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0001-avformat-flvenc-Check-audio-packet-size.patch Normal file
View File

@ -0,0 +1,33 @@
From 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
Date: Sat, 28 Jul 2018 15:03:50 +0200
Subject: [PATCH] avformat/flvenc: Check audio packet size
Fixes: Assertion failure
Fixes: assert_flvenc.c:941_1.swf
Found-by: #CHEN HONGXU# <HCHEN017@e.ntu.edu.sg>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
libavformat/flvenc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 1c552a3e6b..e4863f1fc7 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt)
int flags = -1, flags_size, ret;
int64_t cur_offset = avio_tell(pb);
+ if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) {
+ av_log(s, AV_LOG_WARNING, "Empty audio Packet\n");
+ return AVERROR(EINVAL);
+ }
+
if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A ||
par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC)
flags_size = 2;
--
2.18.0

6
ffmpeg-4.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Aug 24 07:19:30 UTC 2018 - jengelh@inai.de
- Add 0001-avformat-flvenc-Check-audio-packet-size.patch
[CVE-2018-15822, boo#1105869]
-------------------------------------------------------------------
Mon Aug 13 18:07:13 UTC 2018 - bjorn.lie@gmail.com

1
ffmpeg-4.spec
View File

@ -118,6 +118,7 @@ Patch2: ffmpeg-arm6l.diff
Patch3: ffmpeg-new-coder-errors.diff
Patch4: ffmpeg-codec-choice.diff
Patch5: cve-2017-17555.diff
Patch6: 0001-avformat-flvenc-Check-audio-packet-size.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel