diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-31 22:18:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-06-16 01:05:29 +0200 |
| commit | 1d6983c89907b1540d71ba0df6b5f96a8d828635 (patch) | |
| tree | e68653cc0e7598adaeaf264a5355f7e4311b72c0 | |
| parent | 64ecc9eda97600a6a778eac84796e837354b0b36 (diff) | |
| download | ffmpeg-1d6983c89907b1540d71ba0df6b5f96a8d828635.tar.gz | |
avcodec/cinepak: Check input packet size before frame reallocation
Reduces time spend decoding 1917/clusterfuzz-testcase-minimized-5023221273329664
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 e47057e932ff9a071d52fa1d5d4a956340eb2475)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cinepak.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 737462bd9c..4b12fcbca6 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -322,9 +322,6 @@ static int cinepak_decode (CinepakContext *s) int y0 = 0; int encoded_buf_size; - if (s->size < 10) - return AVERROR_INVALIDDATA; - frame_flags = s->data[0]; num_strips = AV_RB16 (&s->data[8]); encoded_buf_size = AV_RB24(&s->data[1]); @@ -439,6 +436,9 @@ static int cinepak_decode_frame(AVCodecContext *avctx, s->data = buf; s->size = buf_size; + if (s->size < 10) + return AVERROR_INVALIDDATA; + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; |