virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/dhav: Check reading data

Browse Source 
Prevents potential use of uninitialized data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-08 01:07:02 +02:00
parent e3ba364c5e
commit 0ae55affa3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/dhav.c
View File

@@ -261,13 +261,12 @@ static int64_t get_duration(AVFormatContext *s)
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;
}
if (!end_buffer)
goto fail;
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);
if (ffio_read_size(s->pb, end_buffer, end_buffer_size) < 0)
goto fail;
offset = end_buffer_size - 8;
while (offset > 0) {
@@ -280,11 +279,8 @@ static int64_t get_duration(AVFormatContext *s)
}
}
if (end_pos < 0 || end_pos + 16 > end_buffer_pos + end_buffer_size) {
av_freep(&end_buffer);
avio_seek(s->pb, start_pos, SEEK_SET);
return 0;
}
if (end_pos < 0 || end_pos + 16 > end_buffer_pos + end_buffer_size)
goto fail;
date = AV_RL32(end_buffer + (end_pos - end_buffer_pos) + 16);
get_timeinfo(date, &timeinfo);
@@ -295,6 +291,10 @@ static int64_t get_duration(AVFormatContext *s)
avio_seek(s->pb, start_pos, SEEK_SET);
return end - start;
fail:
av_freep(&end_buffer);
avio_seek(s->pb, start_pos, SEEK_SET);
return 0;
}
static int dhav_read_header(AVFormatContext *s)