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

avcodec/smacker: Check that not all tables are skiped

Browse Source 
If all tables are skipped it would be impossible to encode any
"non black" video.

Fixes: Timeout (78sec -> 1ms)
Fixes: 15821/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SMACKER_fuzzer-5652598838788096

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-08-08 22:38:11 +02:00
parent 5231e89eb9
commit 1c9a56b139
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/smacker.c
View File

@ -319,6 +319,7 @@ error:
static int decode_header_trees(SmackVContext *smk) {
GetBitContext gb;
int mmap_size, mclr_size, full_size, type_size, ret;
int skip = 0;
mmap_size = AV_RL32(smk->avctx->extradata);
mclr_size = AV_RL32(smk->avctx->extradata + 4);
@ -330,6 +331,7 @@ static int decode_header_trees(SmackVContext *smk) {
return ret;
if(!get_bits1(&gb)) {
skip ++;
av_log(smk->avctx, AV_LOG_INFO, "Skipping MMAP tree\n");
smk->mmap_tbl = av_malloc(sizeof(int) * 2);
if (!smk->mmap_tbl)
@ -342,6 +344,7 @@ static int decode_header_trees(SmackVContext *smk) {
return ret;
}
if(!get_bits1(&gb)) {
skip ++;
av_log(smk->avctx, AV_LOG_INFO, "Skipping MCLR tree\n");
smk->mclr_tbl = av_malloc(sizeof(int) * 2);
if (!smk->mclr_tbl)
@ -354,6 +357,7 @@ static int decode_header_trees(SmackVContext *smk) {
return ret;
}
if(!get_bits1(&gb)) {
skip ++;
av_log(smk->avctx, AV_LOG_INFO, "Skipping FULL tree\n");
smk->full_tbl = av_malloc(sizeof(int) * 2);
if (!smk->full_tbl)
@ -366,6 +370,7 @@ static int decode_header_trees(SmackVContext *smk) {
return ret;
}
if(!get_bits1(&gb)) {
skip ++;
av_log(smk->avctx, AV_LOG_INFO, "Skipping TYPE tree\n");
smk->type_tbl = av_malloc(sizeof(int) * 2);
if (!smk->type_tbl)
@ -377,6 +382,8 @@ static int decode_header_trees(SmackVContext *smk) {
if (ret < 0)
return ret;
}
if (skip == 4)
return AVERROR_INVALIDDATA;
return 0;
}