diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-09 21:20:04 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-06-18 20:53:56 +0200 |
commit | d91f3644ce3b32adcc31b2f559b6c82f1d5b567e (patch) | |
tree | 4f9f0965298f8e61816552b68a99c9464b39c375 | |
parent | 4afa465eb33263dec1d0ef6e75ff931242447d66 (diff) | |
download | ffmpeg-d91f3644ce3b32adcc31b2f559b6c82f1d5b567e.tar.gz |
avcodec/faxcompr: Check if bits are available before reading in cmode == 9 || cmode == 10
Fixes: Timeout
Fixes: 34950/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-5686764151898112
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 7d8421e3d5bc1300687a65384baccbcb3874b7ac)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/faxcompr.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c index d44de2485d..45e0c482d7 100644 --- a/libavcodec/faxcompr.c +++ b/libavcodec/faxcompr.c @@ -304,7 +304,10 @@ static int decode_group3_2d_line(AVCodecContext *avctx, GetBitContext *gb, mode = !mode; } } else if (cmode == 9 || cmode == 10) { - int xxx = get_bits(gb, 3); + int xxx; + if (get_bits_left(gb) < 3) + return AVERROR_INVALIDDATA; + xxx = get_bits(gb, 3); if (cmode == 9 && xxx == 7) { int ret; int pix_left = width - offs; |