diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-25 21:23:26 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-05-09 23:03:53 +0300 |
| commit | 6dd8420290ef79945ec33e65fc3751e6e0bd9433 (patch) | |
| tree | a0bcc10c274400725dcea0dd050a098ef0398fdd /libavcodec/scpr.c | |
| parent | a6cd3ad21f1cd6f90aa1e818ece0e399ff66d685 (diff) | |
avcodec/scpr: check remaining data after decode
Fixes Timeout (29sec -> 14sec)
Fixes: 13713/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SCPR_fuzzer-5756778069884928
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/scpr.c')
| -rw-r--r-- | libavcodec/scpr.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index ce614ffacf..10fc994ecf 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -575,6 +575,9 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (ret < 0) return ret; + if (bytestream2_get_bytes_left(gb) > 5) + return AVERROR_INVALIDDATA; + if (avctx->bits_per_coded_sample != 16) { ret = av_frame_ref(data, s->current_frame); if (ret < 0) |