virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

avcodec/rscc: Avoid returning frames that have nearly no undamaged pixels in them

Browse Source 
Fixes: Timeout
Fixes: 12192/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-6279038004363264

Before: clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-6279038004363264 in 15423 ms
After:  clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RSCC_fuzzer-6279038004363264 in 190 ms

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-01-19 00:00:49 +01:00
parent 5bcefceec8
commit eb1f95eb35
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/rscc.c
View File

@ -64,6 +64,7 @@ typedef struct RsccContext {
/* zlib interaction */ /* zlib interaction */
uint8_t *inflated_buf; uint8_t *inflated_buf;
uLongf inflated_size; uLongf inflated_size;
int valid_pixels
} RsccContext; } RsccContext;
static av_cold int rscc_init(AVCodecContext *avctx) static av_cold int rscc_init(AVCodecContext *avctx)
@ -347,8 +348,11 @@ static int rscc_decode_frame(AVCodecContext *avctx, void *data,
} }
memcpy (frame->data[1], ctx->palette, AVPALETTE_SIZE); memcpy (frame->data[1], ctx->palette, AVPALETTE_SIZE);
} }
// We only return a picture when enough of it is undamaged, this avoids copying nearly broken frames around
*got_frame = 1; if (ctx->valid_pixels < ctx->inflated_size)
ctx->valid_pixels += pixel_size;
if (ctx->valid_pixels >= ctx->inflated_size * (100 - avctx->discard_damaged_percentage) / 100)
*got_frame = 1;
ret = avpkt->size; ret = avpkt->size;
end: end: