summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2025-06-07 01:12:20 +0200
committerMichael Niedermayer <[email protected]>2025-06-07 19:36:49 +0200
commit21fd1b5ba5fc6f2d7a13d97b056c615b1e237558 (patch)
tree25d7dae9e696a4b9a1af366c4ad7bb54bd753105
parent4611ed5cc38d0367186f936dc015a9b3946c3edf (diff)
avformat/dhav: Do not evaluate avio_size() multiple times
Code like FFMIN(MAX_DURATION_BUFFER_SIZE, avio_size(s->pb)) is not safe as FFMIN() is a macro and avio_size() is thus evaluated multiple times Reviewed-by: Derek Buitenhuis <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavformat/dhav.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavformat/dhav.c b/libavformat/dhav.c
index d9db775802..31f4d75181 100644
--- a/libavformat/dhav.c
+++ b/libavformat/dhav.c
@@ -246,11 +246,12 @@ static int64_t get_duration(AVFormatContext *s)
int64_t end_buffer_pos;
int64_t offset;
unsigned date;
+ int64_t size = avio_size(s->pb);
if (!s->pb->seekable)
return 0;
- if (start_pos + 16 > avio_size(s->pb))
+ if (start_pos + 16 > size)
return 0;
avio_skip(s->pb, 16);
@@ -258,13 +259,13 @@ static int64_t get_duration(AVFormatContext *s)
get_timeinfo(date, &timeinfo);
start = av_timegm(&timeinfo) * 1000LL;
- end_buffer_size = FFMIN(MAX_DURATION_BUFFER_SIZE, avio_size(s->pb));
+ end_buffer_size = FFMIN(MAX_DURATION_BUFFER_SIZE, size);
end_buffer = av_malloc(end_buffer_size);
if (!end_buffer) {
avio_seek(s->pb, start_pos, SEEK_SET);
return 0;
}
- end_buffer_pos = avio_size(s->pb) - end_buffer_size;
+ end_buffer_pos = size - end_buffer_size;
avio_seek(s->pb, end_buffer_pos, SEEK_SET);
avio_read(s->pb, end_buffer, end_buffer_size);