Module: libav Branch: release/0.7 Commit: 684f671f2874855d6e9872213097e732bc5cfb18
Author: Alex Converse <[email protected]> Committer: Reinhard Tartler <[email protected]> Date: Wed Sep 21 15:26:35 2011 -0700 mp4: Don't read an empty Decoder Config Descriptor (cherry picked from commit 1c2e07b8111b24f62b8d1bda62907848e34dfbcb) Signed-off-by: Anton Khirnov <[email protected]> --- libavformat/isom.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libavformat/isom.c b/libavformat/isom.c index eb17e25..fb2ce23 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -395,7 +395,7 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext len = ff_mp4_read_descr(fc, pb, &tag); if (tag == MP4DecSpecificDescrTag) { av_dlog(fc, "Specific MPEG4 header len=%d\n", len); - if((uint64_t)len > (1<<30)) + if (!len || (uint64_t)len > (1<<30)) return -1; av_free(st->codec->extradata); st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
