Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
 help / color / mirror / Atom feed
From: Michael Niedermayer <michael@niedermayer.cc>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: [FFmpeg-devel] [PATCH 8/9] avformat/mov: Use 64bit in intermediate for current_dts
Date: Mon,  3 Jun 2024 04:15:25 +0200
Message-ID: <20240603021526.2372698-8-michael@niedermayer.cc> (raw)
In-Reply-To: <20240603021526.2372698-1-michael@niedermayer.cc>

Fixes: CID1500304 Unintentional integer overflow
Fixes: CID1500318 Unintentional integer overflow

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavformat/mov.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 45eca74d1db..d15b7b70c50 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -3389,12 +3389,12 @@ static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
             corrected_dts += sample_duration * sample_count;
         }
 
-        current_dts += sc->stts_data[i].duration * sample_count;
+        current_dts += sc->stts_data[i].duration * (int64_t)sample_count;
 
         if (current_dts > corrected_dts) {
             int64_t drift = (current_dts - corrected_dts)/FFMAX(sample_count, 1);
             uint32_t correction = (sc->stts_data[i].duration > drift) ? drift : sc->stts_data[i].duration - 1;
-            current_dts -= correction * sample_count;
+            current_dts -= correction * (uint64_t)sample_count;
             sc->stts_data[i].duration -= correction;
         }
 
-- 
2.45.1

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

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

  parent reply	other threads:[~2024-06-03  2:16 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-03  2:15 [FFmpeg-devel] [PATCH 1/9] avdevice/xcbgrab: Check sscanf() return Michael Niedermayer
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 2/9] avformat/iamf_parse: Remove dead case Michael Niedermayer
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 3/9] avformat/imfdec: Simplify get_next_track_with_minimum_timestamp() Michael Niedermayer
2024-06-03  4:26   ` Pierre-Anthony Lemieux
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 4/9] avformat/img2dec: Move DQT after unrelated if() Michael Niedermayer
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 5/9] avformat/img2dec: Little JFIF / Exif cleanup Michael Niedermayer
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 6/9] avformat/libzmq: Check av_strstart() Michael Niedermayer
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 7/9] avformat/matroskadec: Assert that num_levels is non negative Michael Niedermayer
2024-06-03  2:15 ` Michael Niedermayer [this message]
2024-06-03  2:15 ` [FFmpeg-devel] [PATCH 9/9] avformat/mov: Use int64_t in intermediate for corrected_dts Michael Niedermayer
2024-08-15  0:59   ` Kacper Michajlow
2024-06-11 22:17 ` [FFmpeg-devel] [PATCH 1/9] avdevice/xcbgrab: Check sscanf() return Michael Niedermayer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240603021526.2372698-8-michael@niedermayer.cc \
    --to=michael@niedermayer.cc \
    --cc=ffmpeg-devel@ffmpeg.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
		ffmpegdev@gitmailbox.com
	public-inbox-index ffmpegdev

Example config snippet for mirrors.


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git