Module: libav Branch: release/11 Commit: 5fdcbc4a7cd81114a9f47bcb3040ca510bd6360d
Author: Luca Barbato <[email protected]> Committer: Sean McGovern <[email protected]> Date: Tue Mar 8 11:57:16 2016 +0100 mov: Check the entries value when parsing dref boxes And properly reset the entries count when resetting the entries. CC: [email protected] Bug-Id: 929 Bug-Id: CVE-2016-3062 (cherry picked from commit 7e01d48cfd168c3dfc663f03a3b6a98e0ecba328) Signed-off-by: Sean McGovern <[email protected]> --- libavformat/mov.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index 26d220d..f7c44e1 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -411,9 +411,11 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom) avio_rb32(pb); // version + flags entries = avio_rb32(pb); - if (entries > (atom.size - 1) / MIN_DATA_ENTRY_BOX_SIZE + 1 || + if (!entries || + entries > (atom.size - 1) / MIN_DATA_ENTRY_BOX_SIZE + 1 || entries >= UINT_MAX / sizeof(*sc->drefs)) return AVERROR_INVALIDDATA; + sc->drefs_count = 0; av_free(sc->drefs); sc->drefs = av_mallocz(entries * sizeof(*sc->drefs)); if (!sc->drefs) _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
