32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
From d973fcbcc2f944752ff10e6a76b0b2d9329937a7 Mon Sep 17 00:00:00 2001
|
|
From: Michael Niedermayer <michael@niedermayer.cc>
|
|
Date: Sat, 30 Sep 2023 00:38:17 +0200
|
|
Subject: [PATCH] avformat/cafdec: dont seek beyond 64bit
|
|
|
|
Fixes: signed integer overflow: 64 + 9223372036854775807 cannot be represented in type 'long long'
|
|
Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
|
|
Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
|
|
|
|
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
|
|
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
|
|
---
|
|
libavformat/cafdec.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
|
|
index 8622859..f5c62a8 100644
|
|
--- a/libavformat/cafdec.c
|
|
+++ b/libavformat/cafdec.c
|
|
@@ -209,7 +209,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
|
|
st->duration += caf->frames_per_packet ? caf->frames_per_packet : ff_mp4_read_descr_len(pb);
|
|
}
|
|
|
|
- if (avio_tell(pb) - ccount > size) {
|
|
+ if (avio_tell(pb) - ccount > size || size > INT64_MAX - ccount) {
|
|
av_log(s, AV_LOG_ERROR, "error reading packet table\n");
|
|
return AVERROR_INVALIDDATA;
|
|
}
|
|
--
|
|
2.43.0
|
|
|