diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2023-09-14 01:47:33 +0200 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2023-09-26 12:44:13 +0200 |
| commit | 2e04d35c69e6f8b4bdb46caa4a880c7c2ba3b141 (patch) | |
| tree | db769ee20e099a3e9496f45954ae52573793b69c /libavcodec | |
| parent | 8d5db120c2572ef81b771b588a81da65cf4b2416 (diff) | |
| download | ffmpeg-2e04d35c69e6f8b4bdb46caa4a880c7c2ba3b141.tar.gz | |
avcodec/vlc: Attempt to free buf after use in ff_vlc_init_multi_from_lengths()
Fixes: use after free
Fixes: 62153/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MAGICYUV_fuzzer-4702814909366272
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vlc.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libavcodec/vlc.c b/libavcodec/vlc.c index 3b66c94354..e5ec325327 100644 --- a/libavcodec/vlc.c +++ b/libavcodec/vlc.c @@ -471,10 +471,13 @@ int ff_vlc_init_multi_from_lengths(VLC *vlc, VLC_MULTI *multi, int nb_bits, int goto fail; } } - ret = vlc_common_end(vlc, nb_bits, j, buf, flags, localbuf); + ret = vlc_common_end(vlc, nb_bits, j, buf, flags, buf); if (ret < 0) goto fail; - return vlc_multi_gen(multi->table, vlc, nb_elems, j, nb_bits, buf, logctx); + ret = vlc_multi_gen(multi->table, vlc, nb_elems, j, nb_bits, buf, logctx); + if (buf != localbuf) + av_free(buf); + return ret; fail: if (buf != localbuf) av_free(buf); |