[FFmpeg-cvslog] avcodec/faxcompr: Check for end of input in cmode == 1 in decode_group3_2d_line()

2021-09-08 Thread Michael Niedermayer 
ffmpeg | branch: release/4.4 | Michael Niedermayer  | 
Sat Jul 31 21:17:23 2021 +0200| [f6f682f5aac684e3579553dc3981746623ac3f6e] | 
committer: Michael Niedermayer

avcodec/faxcompr: Check for end of input in cmode == 1 in 
decode_group3_2d_line()

Fixes: Infinite loop
Fixes: 
35591/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4503764022198272

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
(cherry picked from commit f803635c4fac761ac68b39a369272d4c26433dc1)
Signed-off-by: Michael Niedermayer 

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

 libavcodec/faxcompr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 44c1f6f6b9..b283831dae 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -283,6 +283,8 @@ static int decode_group3_2d_line(AVCodecContext *avctx, 
GetBitContext *gb,
 for (k = 0; k < 2; k++) {
 run = 0;
 for (;;) {
+if (get_bits_left(gb) <= 0)
+return AVERROR_INVALIDDATA;
 t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
 if (t == -1) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".

[FFmpeg-cvslog] avcodec/faxcompr: Check for end of input in cmode == 1 in decode_group3_2d_line()

2021-08-10 Thread Michael Niedermayer 
ffmpeg | branch: master | Michael Niedermayer  | Sat 
Jul 31 21:17:23 2021 +0200| [f803635c4fac761ac68b39a369272d4c26433dc1] | 
committer: Michael Niedermayer

avcodec/faxcompr: Check for end of input in cmode == 1 in 
decode_group3_2d_line()

Fixes: Infinite loop
Fixes: 
35591/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TIFF_fuzzer-4503764022198272

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 

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

 libavcodec/faxcompr.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 44c1f6f6b9..b283831dae 100644
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -283,6 +283,8 @@ static int decode_group3_2d_line(AVCodecContext *avctx, 
GetBitContext *gb,
 for (k = 0; k < 2; k++) {
 run = 0;
 for (;;) {
+if (get_bits_left(gb) <= 0)
+return AVERROR_INVALIDDATA;
 t = get_vlc2(gb, ccitt_vlc[mode].table, 9, 2);
 if (t == -1) {
 av_log(avctx, AV_LOG_ERROR, "Incorrect code\n");

___
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

To unsubscribe, visit link above, or email
ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".