Module: libav Branch: release/11 Commit: 96af65b270392e4dfa81a6e62cc500b9252c0a2c
Author: Sean McGovern <[email protected]> Committer: Sean McGovern <[email protected]> Date: Fri Jul 28 16:17:33 2017 -0400 mov: log and return early on non-positive stsd entry counts Based on an FFmpeg patch by Michael Niedermayer <[email protected]> (cherry picked from commit d7bdab1ad78ef582ba8c96dc7b79ec9fdbeeb94f) Signed-off-by: Sean McGovern <[email protected]> --- libavformat/mov.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/mov.c b/libavformat/mov.c index 5b5d1ca..c37a66f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1607,6 +1607,11 @@ static int mov_read_stsd(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb24(pb); /* flags */ entries = avio_rb32(pb); + if (entries <= 0) { + av_log(c->fc, AV_LOG_ERROR, "invalid STSD entries %d\n", entries); + return AVERROR_INVALIDDATA; + } + return ff_mov_read_stsd_entries(c, pb, entries); } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
