[FFmpeg-cvslog] avcodec/tak: Check remaining bits in ff_tak_decode_frame_header()

Michael Niedermayer git at videolan.org
Thu Oct 19 14:31:31 EEST 2023


ffmpeg | branch: release/2.8 | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr 16 17:34:16 2023 +0200| [c31def00a503259c894fcd5bd703a3af13484fc6] | committer: Michael Niedermayer

avcodec/tak: Check remaining bits in ff_tak_decode_frame_header()

Fixes: out of array access
Fixes: 45982/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TAK_fuzzer-6682195323650048

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit 19b66b89da4b4ff086dc1fc79bbf540e82bdbcb4)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c31def00a503259c894fcd5bd703a3af13484fc6
---

 libavcodec/tak.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/tak.c b/libavcodec/tak.c
index ed41ca8a2e..9b6025b07a 100644
--- a/libavcodec/tak.c
+++ b/libavcodec/tak.c
@@ -152,6 +152,9 @@ int ff_tak_decode_frame_header(AVCodecContext *avctx, GetBitContext *gb,
     if (ti->flags & TAK_FRAME_FLAG_HAS_METADATA)
         return AVERROR_INVALIDDATA;
 
+    if (get_bits_left(gb) < 24)
+        return AVERROR_INVALIDDATA;
+
     skip_bits(gb, 24);
 
     return 0;



More information about the ffmpeg-cvslog mailing list