diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-26 22:58:58 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2024-02-27 00:17:39 +0100 |
| commit | 9d7d03ea4598484e2d200976d0064df41186a630 (patch) | |
| tree | 14515cb3ca868e43c35170c6468c031d8c567f7e /libavformat/mov.c | |
| parent | a6aa043baa06c1b3296b02245c9d71aca273f2ef (diff) | |
| download | ffmpeg-9d7d03ea4598484e2d200976d0064df41186a630.tar.gz | |
Revert "avformat/mov: zero initialize the index ranges buffer"
This reverts commit eee3b7e2fb0664b889e58c03f76e19ef23e4d1d8.
It has been made in an attempt to fix UBSan test failures with
GCC 13 (see e.g. [1]), but it did not help at all. So revert it,
but use av_malloc_array() instead of going back to av_malloc().
[1]: https://fate.ffmpeg.org/report.cgi?slot=x86_64-archlinux-gcc-ubsan&time=20240226182430
Reviewed-by: James Almer <jamrial@gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/mov.c')
| -rw-r--r-- | libavformat/mov.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index effa46120f..71e8f7ae8f 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -4031,7 +4031,8 @@ static void mov_fix_index(MOVContext *mov, AVStream *st) } // allocate the index ranges array - msc->index_ranges = av_calloc((msc->elst_count + 1), sizeof(msc->index_ranges[0])); + msc->index_ranges = av_malloc_array(msc->elst_count + 1, + sizeof(msc->index_ranges[0])); if (!msc->index_ranges) { av_log(mov->fc, AV_LOG_ERROR, "Cannot allocate index ranges buffer\n"); return; |