Module: libav Branch: release/0.8 Commit: ce14f00dea933c930f46d1fb820dd02824a89fb4
Author: Alex Converse <[email protected]> Committer: Alex Converse <[email protected]> Date: Fri Feb 3 10:43:21 2012 -0800 movdec: Avoid av_malloc(0) in stss Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind (cherry picked from commit 29a20ac4a19df5acc0eef306ca5a737778a31358) --- libavformat/mov.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index c6022d5..d14ae7e 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1503,6 +1503,8 @@ static int mov_read_stss(MOVContext *c, AVIOContext *pb, MOVAtom atom) av_dlog(c->fc, "keyframe_count = %d\n", entries); + if (!entries) + return 0; if (entries >= UINT_MAX / sizeof(int)) return AVERROR_INVALIDDATA; sc->keyframes = av_malloc(entries * sizeof(int)); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
