diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-07-28 15:03:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-11-18 02:20:44 +0100 |
| commit | 1b283238226bf2ff1f328ab4811375240224b346 (patch) | |
| tree | 58462976fe76c98da279ce38d13d9c300a0f987f | |
| parent | 09800cbc0105d734c9974f7a5c835f2346026d5e (diff) | |
| download | ffmpeg-1b283238226bf2ff1f328ab4811375240224b346.tar.gz | |
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>
(cherry picked from commit 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/flvenc.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index e50f8e4519..3bb7a216a4 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -575,6 +575,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) uint8_t *data = NULL; int flags = -1, flags_size, ret; + 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; |