diff options
| author | Jonathan Baudanza <jon@jonb.org> | 2025-01-08 09:22:13 +0900 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2025-01-10 12:09:27 +0200 |
| commit | c0fbb6d5b7aab2e01125e30c69c0af4c07855e6f (patch) | |
| tree | 6d459baf87d2022734164506f348ca0de197b435 | |
| parent | 251de1791e645f16e80b09d82999d4a5e24b1ad1 (diff) | |
| download | ffmpeg-c0fbb6d5b7aab2e01125e30c69c0af4c07855e6f.tar.gz | |
avformat/rtpdec: int overflow in start_time_realtime
This was previously adjusted by me in 6b3f9c2e92b.
Unfortunately, I traded one integer overflow bug for
another.
Currently, NTP timestamps that exceed INT64_MAX
(~Jan 20, 1968) will cause an overflow when passed
to av_rescale.
This patch replaces av_rescale, which operates on
int64_t, with ff_parse_ntp_time, which operates on
uint64_t. This will give the correct values for
timestamps back around the NTP epoch and present day
timestamps.
Fixes ticket #11388.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavformat/rtsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index c48fa26d90..5ea471b40c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -2320,7 +2320,7 @@ redo: } // Make real NTP start time available in AVFormatContext if (s->start_time_realtime == AV_NOPTS_VALUE) { - s->start_time_realtime = av_rescale (rtpctx->first_rtcp_ntp_time, 1000000, 1LL << 32) - NTP_OFFSET_US; + s->start_time_realtime = ff_parse_ntp_time(rtpctx->first_rtcp_ntp_time) - NTP_OFFSET_US; if (rtpctx->st) { s->start_time_realtime -= av_rescale_q (rtpctx->rtcp_ts_offset, rtpctx->st->time_base, AV_TIME_BASE_Q); |