Browse Source

rv34: check that subsequent slices have the same type as first one.

This prevents some crashes when corrupted bitstream reports e.g. P-type
slice in I-frame. Official RealVideo decoder demands all slices to be
of the same type too.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
tags/n0.9
Kostya Shishkov Anton Khirnov 14 years ago
parent
commit
23a1f0c592
1 changed files with 7 additions and 0 deletions
  1. +7
    -0
      libavcodec/rv34.c

+ 7
- 0
libavcodec/rv34.c View File

@@ -1336,6 +1336,13 @@ static int rv34_decode_slice(RV34DecContext *r, int end, const uint8_t* buf, int
}
}
s->mb_x = s->mb_y = 0;
} else {
int slice_type = r->si.type ? r->si.type : AV_PICTURE_TYPE_I;

if (slice_type != s->pict_type) {
av_log(s->avctx, AV_LOG_ERROR, "Slice type mismatch\n");
return AVERROR_INVALIDDATA;
}
}

r->si.end = end;


Loading…
Cancel
Save