diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-24 19:52:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-24 20:03:33 +0200 |
| commit | cfec0d64752509f8ac798acca6225df630fa5284 (patch) | |
| tree | 0a062051ed458e0db8619dd5a0a17e27aa9110d1 /libavcodec/cllc.c | |
| parent | bce362d36ccfe8f778662bcfd956187c958a39b5 (diff) | |
| download | ffmpeg-cfec0d64752509f8ac798acca6225df630fa5284.tar.gz | |
avcodec/cllc: Check bitstream end before decoding pixels
Fixes timeout
Fixes: 1802/clusterfuzz-testcase-minimized-5008293510512640
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/cllc.c')
| -rw-r--r-- | libavcodec/cllc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/cllc.c b/libavcodec/cllc.c index 933144ae81..af0f6da2e9 100644 --- a/libavcodec/cllc.c +++ b/libavcodec/cllc.c @@ -429,6 +429,9 @@ static int cllc_decode_frame(AVCodecContext *avctx, void *data, coding_type = (AV_RL32(src) >> 8) & 0xFF; av_log(avctx, AV_LOG_DEBUG, "Frame coding type: %d\n", coding_type); + if(get_bits_left(&gb) < avctx->height * avctx->width) + return AVERROR_INVALIDDATA; + switch (coding_type) { case 0: avctx->pix_fmt = AV_PIX_FMT_YUV422P; |