projects / ffmpeg.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3716926)
avformat/avidec: Fix integer overflow iff ULONG_MAX < INT64_MAX
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>
Tue, 12 Mar 2024 22:23:17 +0000 (23:23 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 23 Nov 2025 03:32:16 +0000 (04:32 +0100)
Affects many FATE-tests, see
https://fate.ffmpeg.org/report.cgi?time=20240312011016&slot=ppc-linux-gcc-13.2-ubsan-altivec-qemu

Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
(cherry picked from commit 7a089ed8e049e3bfcb22de1250b86f2106060857)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/avidec.c patch | blob | history

diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 1cd1edf24cb42aa077563fca47e84aa60f29935a..73938c640c599c88982df5e2a06d7a0a62c84231 100644 (file)
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -1699,7 +1699,7 @@ static int check_stream_max_drift(AVFormatContext *s)
     int *idx = av_calloc(s->nb_streams, sizeof(*idx));
     if (!idx)
         return AVERROR(ENOMEM);
-    for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1LU) {
+    for (min_pos = pos = 0; min_pos != INT64_MAX; pos = min_pos + 1ULL) {
         int64_t max_dts = INT64_MIN / 2;
         int64_t min_dts = INT64_MAX / 2;
         int64_t max_buffer = 0;
FFmpeg git repo