highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/hapdec: Check tex_size more strictly and before using it

Browse Source 
Fixes: OOM
Fixes: 20774/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5678608951803904
Fixes: 20956/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_HAP_fuzzer-5713643025203200

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 81fe316ad9852a3dfe46b4dc919ed1709b217671)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2020-03-28 20:36:00 +01:00
parent 83f883cea7
commit c8a7672299
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libavcodec/hapdec.c
View File

@ -305,7 +305,6 @@ 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, t; int ret, i, t;
int tex_size;
int section_size; int section_size;
enum HapSectionType section_type; enum HapSectionType section_type;
int start_texture_section = 0; int start_texture_section = 0;
@ -342,6 +341,13 @@ static int hap_decode(AVCodecContext *avctx, void *data,
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ctx->tex_size != (avctx->coded_width / TEXTURE_BLOCK_W)
*(avctx->coded_height / TEXTURE_BLOCK_H)
*tex_rat[t]) {
av_log(avctx, AV_LOG_ERROR, "uncompressed size mismatches\n");
return AVERROR_INVALIDDATA;
}
start_texture_section += ctx->texture_section_size + 4; start_texture_section += ctx->texture_section_size + 4;
if (avctx->codec->update_thread_context) if (avctx->codec->update_thread_context)
@ -349,9 +355,16 @@ static int hap_decode(AVCodecContext *avctx, void *data,
/* Unpack the DXT texture */ /* Unpack the DXT texture */
if (hap_can_use_tex_in_place(ctx)) { if (hap_can_use_tex_in_place(ctx)) {
int tex_size;
/* 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 = FFMIN(ctx->texture_section_size, bytestream2_get_bytes_left(&ctx->gbc)); tex_size = FFMIN(ctx->texture_section_size, bytestream2_get_bytes_left(&ctx->gbc));
if (tex_size < (avctx->coded_width / TEXTURE_BLOCK_W)
*(avctx->coded_height / TEXTURE_BLOCK_H)
*tex_rat[t]) {
av_log(avctx, AV_LOG_ERROR, "Insufficient data\n");
return AVERROR_INVALIDDATA;
}
} 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);
@ -367,14 +380,6 @@ 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)
*tex_rat[t]) {
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 */