Browse Source

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 e47057e932)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.1.9
Michael Niedermayer 8 years ago
parent
commit
89b2e25e13
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      libavcodec/cinepak.c

+ 3
- 3
libavcodec/cinepak.c View File

@@ -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;



Loading…
Cancel
Save