aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-03 14:12:44 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-03 17:48:40 +0200
commit3cc685b7bcc2bcc781b5632bf2e0af6ed941ae27 (patch)
tree756ad511bd94e1af4dedd5667deb9a7b8838e75a /libavcodec
parent0ca09335aa47fee181c36187143403811b5452f6 (diff)
downloadffmpeg-3cc685b7bcc2bcc781b5632bf2e0af6ed941ae27.tar.gz
avcodec/mjpegdec: Fix leak in case of invalid external Huffman tables
When using external Huffman tables fails during init, the decoder reverts back to using the default Huffman tables; and when doing so, the current VLC tables leak because init_default_huffman_tables() doesn't free them before overwriting them. Sample: samples.ffmpeg.org/archive/all/avi+mjpeg+pcm_s16le++mjpeg-interlace.avi Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 5583d2aa35..776797d35b 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -76,6 +76,7 @@ static int init_default_huffman_tables(MJpegDecodeContext *s)
int i, ret;
for (i = 0; i < FF_ARRAY_ELEMS(ht); i++) {
+ ff_free_vlc(&s->vlcs[ht[i].class][ht[i].index]);
ret = ff_mjpeg_build_vlc(&s->vlcs[ht[i].class][ht[i].index],
ht[i].bits, ht[i].values,
ht[i].class == 1, s->avctx);