diff options
| author | Andreas Rheinhardt <[email protected]> | 2021-04-03 14:12:44 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <[email protected]> | 2021-04-03 18:07:58 +0200 |
| commit | 1f3735892bb3aed3684333ae237b680fcf480fca (patch) | |
| tree | 71a4d855b8a496e8af361ce604b1bd7bb9be3d27 | |
| parent | edbc26e38b1cb0d53a355ed49a92f58335e0eff9 (diff) | |
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 <[email protected]>
Signed-off-by: Andreas Rheinhardt <[email protected]>
(cherry picked from commit 3cc685b7bcc2bcc781b5632bf2e0af6ed941ae27)
| -rw-r--r-- | libavcodec/mjpegdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 20f310fd70..fd6a4eeb76 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); |