[FFmpeg-cvslog] avcodec/h263dec: Check slice_ret in mspeg4 slice loop
Michael Niedermayer
git at videolan.org
Sat Jun 16 01:30:35 EEST 2018
ffmpeg | branch: release/4.0 | Michael Niedermayer <michael at niedermayer.cc> | Sun Apr 22 21:07:45 2018 +0200| [fe7f2a77c78281fae526268612610fccada9bc74] | committer: Michael Niedermayer
avcodec/h263dec: Check slice_ret in mspeg4 slice loop
Fixes infinite loop
Fixes: 6858/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_MSMPEG4V3_fuzzer-4681563766784000
Fixes: 6890/clusterfuzz-testcase-ffmpeg_AV_CODEC_ID_WMV1_fuzzer-4756103142309888
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 de841fbea7655b74a9663001e01008a86c88779a)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe7f2a77c78281fae526268612610fccada9bc74
---
libavcodec/h263dec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 484bf39578..eae29fa438 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -641,7 +641,7 @@ retry:
slice_ret = decode_slice(s);
while (s->mb_y < s->mb_height) {
if (s->msmpeg4_version) {
- if (s->slice_height == 0 || s->mb_x != 0 ||
+ if (s->slice_height == 0 || s->mb_x != 0 || slice_ret < 0 ||
(s->mb_y % s->slice_height) != 0 || get_bits_left(&s->gb) < 0)
break;
} else {
More information about the ffmpeg-cvslog
mailing list