From 07f3304fcc1bd10f3fa5a9f730728fd16a9fce763adaa405a41abfbbc408e420 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 24 Aug 2018 07:26:10 +0000 Subject: [PATCH] - Add 0001-avformat-flvenc-Check-audio-packet-size.patch [CVE-2018-15822, boo#1105869] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=23 --- ...ormat-flvenc-Check-audio-packet-size.patch | 33 +++++++++++++++++++ ffmpeg-4.changes | 6 ++++ ffmpeg-4.spec | 1 + 3 files changed, 40 insertions(+) create mode 100644 0001-avformat-flvenc-Check-audio-packet-size.patch diff --git a/0001-avformat-flvenc-Check-audio-packet-size.patch b/0001-avformat-flvenc-Check-audio-packet-size.patch new file mode 100644 index 0000000..dd2dd2b --- /dev/null +++ b/0001-avformat-flvenc-Check-audio-packet-size.patch @@ -0,0 +1,33 @@ +From 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 Mon Sep 17 00:00:00 2001 +From: Michael Niedermayer +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# +Signed-off-by: Michael Niedermayer +--- + 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 + diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 8549602..0ed0134 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -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 diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 3d16678..3a5a87f 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -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