Browse Source

proresdec: check input size before reading qmats, prevent overreading.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 12 years ago
parent
commit
c871244306
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      libavcodec/proresdec2.c

+ 8
- 0
libavcodec/proresdec2.c View File

@@ -133,6 +133,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
av_dlog(avctx, "flags %x\n", flags); av_dlog(avctx, "flags %x\n", flags);


if (flags & 2) { if (flags & 2) {
if(buf + data_size - ptr < 64) {
av_log(avctx, AV_LOG_ERROR, "Header truncated\n");
return -1;
}
permute(ctx->qmat_luma, ctx->prodsp.idct_permutation, ptr); permute(ctx->qmat_luma, ctx->prodsp.idct_permutation, ptr);
ptr += 64; ptr += 64;
} else { } else {
@@ -140,6 +144,10 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf,
} }


if (flags & 1) { if (flags & 1) {
if(buf + data_size - ptr < 64) {
av_log(avctx, AV_LOG_ERROR, "Header truncated\n");
return -1;
}
permute(ctx->qmat_chroma, ctx->prodsp.idct_permutation, ptr); permute(ctx->qmat_chroma, ctx->prodsp.idct_permutation, ptr);
} else { } else {
memset(ctx->qmat_chroma, 4, 64); memset(ctx->qmat_chroma, 4, 64);


Loading…
Cancel
Save