[FFmpeg-cvslog] avformat/flvenc: Check audio packet size
Michael Niedermayer
git at videolan.org
Thu Nov 1 02:54:35 EET 2018
ffmpeg | branch: release/3.3 | Michael Niedermayer <michael at niedermayer.cc> | Sat Jul 28 15:03:50 2018 +0200| [0026d007428a1ef5cd4e8f54bafc54c0306beab9] | committer: Michael Niedermayer
avformat/flvenc: Check audio packet size
Fixes: Assertion failure
Fixes: assert_flvenc.c:941_1.swf
Found-by: #CHEN HONGXU# <HCHEN017 at e.ntu.edu.sg>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0026d007428a1ef5cd4e8f54bafc54c0306beab9
---
libavformat/flvenc.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c
index 899b07ea7b..e966c36c65 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -879,6 +879,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;
More information about the ffmpeg-cvslog
mailing list