diff mbox

[FFmpeg-devel] avcodec/scpr: check remaining data after decode

Message ID 20190425213449.18926-1-michael@niedermayer.cc
State Accepted
Commit 6dd8420290ef79945ec33e65fc3751e6e0bd9433
Headers show

Commit Message

Michael Niedermayer April 25, 2019, 9:34 p.m. UTC 
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>
---
 libavcodec/scpr.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Michael Niedermayer May 9, 2019, 8:12 p.m. UTC | #1 
On Thu, Apr 25, 2019 at 11:34:49PM +0200, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/scpr.c | 3 +++
>  1 file changed, 3 insertions(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c
index e5d7d13cf0..0ccc250bfa 100644
--- a/libavcodec/scpr.c
+++ b/libavcodec/scpr.c
@@ -572,6 +572,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)