Browse Source

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: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.1
Martin Storsjö 12 years ago
parent
commit
b1db33159f
1 changed files with 4 additions and 0 deletions
  1. +4
    -0
      libavcodec/ffv1.c

+ 4
- 0
libavcodec/ffv1.c View File

@@ -194,6 +194,10 @@ av_cold int ffv1_init_slice_contexts(FFV1Context *f)
int i; int i;


f->slice_count = f->num_h_slices * f->num_v_slices; 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++) { for (i = 0; i < f->slice_count; i++) {
FFV1Context *fs = av_mallocz(sizeof(*fs)); FFV1Context *fs = av_mallocz(sizeof(*fs));


Loading…
Cancel
Save