ffv1: Make sure at least one slice context is initialized
authorMartin Storsjö <martin@martin.st>
Mon, 16 Sep 2013 18:46:50 +0000 (21:46 +0300)
committerMartin Storsjö <martin@martin.st>
Tue, 17 Sep 2013 08:33:38 +0000 (11:33 +0300)
This avoids crashes when initializing the range coder for
the first slice context.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
libavcodec/ffv1.c

index 378b55b..a31f278 100644 (file)
@@ -194,6 +194,10 @@ av_cold int ffv1_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));