virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/cinepak: Skip empty frames

Browse Source 
Speeds up decoding from 3 to 0.1 seconds for 6302/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CINEPAK_fuzzer-5626371985375232
Fixes: Timeout

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 9033920bec)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2018-04-17 02:13:43 +02:00
parent 4b0181dc00
commit 5d42300731
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/cinepak.c
View File

@ -444,6 +444,7 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
const uint8_t *buf = avpkt->data; const uint8_t *buf = avpkt->data;
int ret = 0, buf_size = avpkt->size; int ret = 0, buf_size = avpkt->size;
CinepakContext *s = avctx->priv_data; CinepakContext *s = avctx->priv_data;
int num_strips;
s->data = buf; s->data = buf;
s->size = buf_size; s->size = buf_size;
@ -451,6 +452,12 @@ static int cinepak_decode_frame(AVCodecContext *avctx,
if (s->size < 10) if (s->size < 10)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
num_strips = AV_RB16 (&s->data[8]);
//Empty frame, do not waste time
if (!num_strips && (!s->palette_video || !av_packet_get_side_data(avpkt, AV_PKT_DATA_PALETTE, NULL)))
return buf_size;
if ((ret = cinepak_predecode_check(s)) < 0) { if ((ret = cinepak_predecode_check(s)) < 0) {
av_log(avctx, AV_LOG_ERROR, "cinepak_predecode_check failed\n"); av_log(avctx, AV_LOG_ERROR, "cinepak_predecode_check failed\n");
return ret; return ret;