virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-04 05:57:49 +02:00
Code Issues Releases Activity

avcodec/hapdec: Check that there is sufficient input data

Browse Source 
Fixes Ticket4729

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-24 03:25:49 +02:00
parent da8b70b810
commit 5da90d7ec3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/hapdec.c
View File

@ -307,6 +307,7 @@ static int hap_decode(AVCodecContext *avctx, void *data,
HapContext *ctx = avctx->priv_data; HapContext *ctx = avctx->priv_data;
ThreadFrame tframe; ThreadFrame tframe;
int ret, i; int ret, i;
int tex_size;
bytestream2_init(&ctx->gbc, avpkt->data, avpkt->size); bytestream2_init(&ctx->gbc, avpkt->data, avpkt->size);
@ -327,6 +328,7 @@ static int hap_decode(AVCodecContext *avctx, void *data,
if (hap_can_use_tex_in_place(ctx)) { if (hap_can_use_tex_in_place(ctx)) {
/* Only DXTC texture compression in a contiguous block */ /* Only DXTC texture compression in a contiguous block */
ctx->tex_data = ctx->gbc.buffer; ctx->tex_data = ctx->gbc.buffer;
tex_size = bytestream2_get_bytes_left(&ctx->gbc);
} else { } else {
/* Perform the second-stage decompression */ /* Perform the second-stage decompression */
ret = av_reallocp(&ctx->tex_buf, ctx->tex_size); ret = av_reallocp(&ctx->tex_buf, ctx->tex_size);
@ -342,6 +344,14 @@ static int hap_decode(AVCodecContext *avctx, void *data,
} }
ctx->tex_data = ctx->tex_buf; ctx->tex_data = ctx->tex_buf;
tex_size = ctx->tex_size;
}
if (tex_size < (avctx->coded_width / TEXTURE_BLOCK_W)
*(avctx->coded_height / TEXTURE_BLOCK_H)
*ctx->tex_rat) {
av_log(avctx, AV_LOG_ERROR, "Insufficient data\n");
return AVERROR_INVALIDDATA;
} }
/* Use the decompress function on the texture, one block per thread */ /* Use the decompress function on the texture, one block per thread */