Module: libav Branch: release/0.8 Commit: 2b71a7884196413d39b90549e58c4488a8f83953
Author: Martin Storsjö <[email protected]> Committer: Luca Barbato <[email protected]> Date: Mon Sep 16 21:46:50 2013 +0300 ffv1: Make sure at least one slice context is initialized This avoids crashes when initializing the range coder for the first slice context. Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: [email protected] Signed-off-by: Martin Storsjö <[email protected]> (cherry picked from commit b1db33159fdc2da4bdd8c75e4ff9a7dd0ef2f0c2) Signed-off-by: Luca Barbato <[email protected]> --- libavcodec/ffv1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 8a6f33f..917f40d 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -708,6 +708,10 @@ static av_cold int init_slice_contexts(FFV1Context *f){ int i; f->slice_count= f->num_h_slices * f->num_v_slices; + if (f->slice_count <= 0) { + av_log(f->avctx, AV_LOG_ERROR, "Invalid number of slices\n"); + return AVERROR(EINVAL); + } for(i=0; i<f->slice_count; i++){ FFV1Context *fs= av_mallocz(sizeof(*fs)); _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
