It is less susceptible to overflows.
Signed-off-by: Derek Buitenhuis <derek.buitenh...@gmail.com>
---
libavformat/mov.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 57c67e3aac..841818b547 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -7989,12 +7989,14 @@ static int mov_read_header(AVFormatContext *s)
AVStream *st = s->streams[i];
MOVStreamContext *sc = st->priv_data;
if (st->duration > 0) {
- if (sc->data_size > INT64_MAX / sc->time_scale / 8) {
+ /* Akin to sc->data_size * 8 * sc->time_scale / st->duration
but accounting for overflows. */
+ st->codecpar->bit_rate = av_rescale(sc->data_size, ((int64_t)
sc->time_scale) * 8, st->duration);
+ if (st->codecpar->bit_rate == INT64_MIN) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate
calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
+ st->codecpar->bit_rate = 0;
return AVERROR_INVALIDDATA;
}
- st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale /
st->duration;
}
}
}
@@ -8004,13 +8006,14 @@ static int mov_read_header(AVFormatContext *s)
AVStream *st = s->streams[i];
MOVStreamContext *sc = st->priv_data;
if (sc->duration_for_fps > 0) {
- if (sc->data_size > INT64_MAX / sc->time_scale / 8) {
+ /* Akin to sc->data_size * 8 * sc->time_scale /
sc->duration_for_fps but accounting for overflows. */
+ st->codecpar->bit_rate = av_rescale(sc->data_size, ((int64_t)
sc->time_scale) * 8, sc->duration_for_fps);
+ if (st->codecpar->bit_rate == INT64_MIN) {
av_log(s, AV_LOG_ERROR, "Overflow during bit rate
calculation %"PRId64" * 8 * %d\n",
sc->data_size, sc->time_scale);
+ st->codecpar->bit_rate = 0;
return AVERROR_INVALIDDATA;
}
- st->codecpar->bit_rate = sc->data_size * 8 * sc->time_scale /
- sc->duration_for_fps;
}
}
}
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
