[FFmpeg-devel] [PATCH 4/6] avformat/cafdec: saturate start + size into 64bit

[Michael Niedermayer]

Fixes: signed integer overflow: 64 + 9223372036854775803 cannot be represented in type 'long long'
Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6536881135550464

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
---
 libavformat/cafdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index e92e3279fc6..0e50a3cfe68 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -435,7 +435,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
 
     /* don't read past end of data chunk */
     if (caf->data_size > 0) {
-        left = (caf->data_start + caf->data_size) - avio_tell(pb);
+        left = av_sat_add64(caf->data_start, caf->data_size) - avio_tell(pb);
         if (!left)
             return AVERROR_EOF;
         if (left < 0)
-- 
2.17.1