Re: [FFmpeg-devel] [PATCH 2/3] avcodec/qdm2: error out of qdm2_fft_decode_tones() before entering endless loop

[Michael Niedermayer]

On Mon, Jun 24, 2019 at 01:01:03AM +0200, Michael Niedermayer wrote:
> Fixes: signed integer overflow: 2147483646 + 2 cannot be represented in type 
> 'int'
> Fixes: infinite loop
> Fixes: 
> 15396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5116605501014016
> 
> Found-by: continuous fuzzing process 
> https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/qdm2.c | 4 
>  1 file changed, 4 insertions(+)

will apply

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If a bugfix only changes things apparently unrelated to the bug with no
further explanation, that is a good sign that the bugfix is wrong.


signature.asc
Description: PGP signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

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

[FFmpeg-devel] [PATCH 2/3] avcodec/qdm2: error out of qdm2_fft_decode_tones() before entering endless loop

[Michael Niedermayer]

Fixes: signed integer overflow: 2147483646 + 2 cannot be represented in type 
'int'
Fixes: infinite loop
Fixes: 
15396/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_QDM2_fuzzer-5116605501014016

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/qdm2.c | 4 
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 52c7cc73a0..42e10829e9 100644
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -1288,6 +1288,10 @@ static void qdm2_fft_decode_tones(QDM2Context *q, int 
duration,
 }
 offset += (n - 2);
 } else {
+if (local_int_10 <= 2) {
+av_log(NULL, AV_LOG_ERROR, "qdm2_fft_decode_tones() stuck\n");
+return;
+}
 offset += qdm2_get_vlc(gb, _tab_fft_tone_offset[local_int_8], 
1, 2);
 while (offset >= (local_int_10 - 1)) {
 offset   += (1 - (local_int_10 - 1));
-- 
2.22.0

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

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