diff options
| author | Marth64 <marth64@proxyid.net> | 2024-12-10 18:04:25 -0600 |
|---|---|---|
| committer | Marth64 <marth64@proxyid.net> | 2024-12-13 22:41:18 -0600 |
| commit | 8291aedf1abfdbc48c9aa18a7929a464c186782a (patch) | |
| tree | 9d223b72ae16d88d2c0595dbb3fd1cbd5bb072f4 | |
| parent | b164dea68c275e61839c8ebae9b346836f9adf90 (diff) | |
| download | ffmpeg-8291aedf1abfdbc48c9aa18a7929a464c186782a.tar.gz | |
avformat/mov: don't reallocate extradata when converting dvdsub palette
After introduction of ff_dvdclut_palette_extradata_cat() to convert
DVD subtitle palettes from YUV to RGB, a leak is introduced because
of the call to ff_alloc_extradata(). This is not necessary, instead
we should free the extradata because ff_bprint_to_codecpar_extradata()
will finalize the bprint'ed string to the codecpar and set the length.
Fixes leak introduced in 3b0e6c0eccd7d61eb089370fc5f2196c2b30336f.
Signed-off-by: Marth64 <marth64@proxyid.net>
| -rw-r--r-- | libavformat/mov.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index 3820983a5d..26f1bf7e1b 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -10602,9 +10602,8 @@ static int mov_read_header(AVFormatContext *s) if (err < 0) return err; - err = ff_alloc_extradata(st->codecpar, FF_DVDCLUT_EXTRADATA_SIZE); - if (err < 0) - return err; + av_freep(&st->codecpar->extradata); + st->codecpar->extradata_size = 0; err = ff_dvdclut_palette_extradata_cat(dvdsub_clut, FF_DVDCLUT_CLUT_SIZE, st->codecpar); |