summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-02-25 01:26:30 +0100
committerMichael Niedermayer <[email protected]>2019-03-21 10:42:52 +0100
commit87eecb7d854599221c4112a241a49e742f4d1f66 (patch)
tree1d8ee90a95f2166358406538454189791b34f4f7
parent24e4039c6fa152b40ff2ebb491f5ea9df88686aa (diff)
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 <[email protected]> (cherry picked from commit 5cf42f65b60d226d1223d2100cb1d90402189275) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/gdv.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/gdv.c b/libavcodec/gdv.c
index 79ca157dde..addd513091 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) {