aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-02-25 01:26:30 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2019-03-24 10:38:51 +0100
commit98fa61c020722f7251435f3377eba449127962d8 (patch)
tree0d7e9bd52ad7dd4ba0ed646a7ca7f45945f7c866
parent6abc6acd50ae02e0e9d77557fab53a665c46aeb9 (diff)
downloadffmpeg-98fa61c020722f7251435f3377eba449127962d8.tar.gz
avcodec/gdv: Check for truncated tags in decompress_5()
Testcase: 13169/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_GDV_fuzzer-5666354038833152 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 5cf42f65b60d226d1223d2100cb1d90402189275) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/gdv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c
index d4d24931c9..98bdee5aca 100644
--- a/libavcodec/gdv.c
+++ b/libavcodec/gdv.c
@@ -244,6 +244,8 @@ static int decompress_5(AVCodecContext *avctx, unsigned skip)
while (bytestream2_get_bytes_left_p(pb) > 0 && bytestream2_get_bytes_left(gb) > 0) {
int tag = read_bits2(&bits, gb);
+ if (bytestream2_get_bytes_left(gb) < 1)
+ return AVERROR_INVALIDDATA;
if (tag == 0) {
bytestream2_put_byte(pb, bytestream2_get_byte(gb));
} else if (tag == 1) {