[FFmpeg-cvslog] avcodec/flac_parser: Make expected_frame_num, expected_sample_num 64bit

Michael Niedermayer git at videolan.org
Tue Oct 8 17:28:11 EEST 2019


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Sep 19 16:28:57 2019 +0200| [c552c3ef70dc353ad5c18d145aa0167cf7b64c67] | committer: Michael Niedermayer

avcodec/flac_parser: Make expected_frame_num, expected_sample_num 64bit

Fixes: Integer overflow
Fixes: 17199/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_FLAC_fuzzer-5696145187143680

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavcodec/flac_parser.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index 9280246af2..9ffa288548 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -313,7 +313,7 @@ static int check_header_mismatch(FLACParseContext  *fpc,
         (child_fi->frame_or_sample_num
          != header_fi->frame_or_sample_num + 1)) {
         FLACHeaderMarker *curr;
-        int expected_frame_num, expected_sample_num;
+        int64_t expected_frame_num, expected_sample_num;
         /* If there are frames in the middle we expect this deduction,
            as they are probably valid and this one follows it */
 



More information about the ffmpeg-cvslog mailing list