Browse Source

avcodec/pafvideo: Check packet size and frame code before ff_reget_buffer()

Fixes 1745/clusterfuzz-testcase-minimized-6160693365571584
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 faa5a2181d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n3.0.9
Michael Niedermayer 8 years ago
parent
commit
ce4196561a
1 changed files with 11 additions and 4 deletions
  1. +11
    -4
      libavcodec/pafvideo.c

+ 11
- 4
libavcodec/pafvideo.c View File

@@ -267,12 +267,20 @@ static int paf_video_decode(AVCodecContext *avctx, void *data,
uint8_t code, *dst, *end;
int i, frame, ret;

if ((ret = ff_reget_buffer(avctx, c->pic)) < 0)
return ret;
if (pkt->size < 2)
return AVERROR_INVALIDDATA;

bytestream2_init(&c->gb, pkt->data, pkt->size);

code = bytestream2_get_byte(&c->gb);
if ((code & 0xF) > 4) {
avpriv_request_sample(avctx, "unknown/invalid code");
return AVERROR_INVALIDDATA;
}

if ((ret = ff_reget_buffer(avctx, c->pic)) < 0)
return ret;

if (code & 0x20) { // frame is keyframe
for (i = 0; i < 4; i++)
memset(c->frame[i], 0, c->frame_size);
@@ -367,8 +375,7 @@ static int paf_video_decode(AVCodecContext *avctx, void *data,
}
break;
default:
avpriv_request_sample(avctx, "unknown/invalid code");
return AVERROR_INVALIDDATA;
av_assert0(0);
}

av_image_copy_plane(c->pic->data[0], c->pic->linesize[0],


Loading…
Cancel
Save