[FFmpeg-cvslog] avcodec/vc1dec: Fix memleak upon allocation error

Andreas Rheinhardt git at videolan.org
Thu Apr 8 13:53:41 EEST 2021


ffmpeg | branch: release/4.4 | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Thu Apr  8 01:49:53 2021 +0200| [c72fca598c90c8550fe51e967ea54dae7f8cbc78] | committer: Andreas Rheinhardt

avcodec/vc1dec: Fix memleak upon allocation error

ff_vc1_decode_init_alloc_tables() had one error path that forgot to free
already allocated buffers; these would then be overwritten on the next
allocation attempt (or they would just not be freed in case this
happened during init, as the decoders for which it is used do not have
the FF_CODEC_CAP_INIT_CLEANUP set).

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
(cherry picked from commit 98060a198ef0bd213d0d0b029f8955fcd3be93d2)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c72fca598c90c8550fe51e967ea54dae7f8cbc78
---

 libavcodec/vc1dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b702b76060..ea93e11588 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -384,7 +384,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
     if (s->avctx->codec_id == AV_CODEC_ID_WMV3IMAGE || s->avctx->codec_id == AV_CODEC_ID_VC1IMAGE) {
         for (i = 0; i < 4; i++)
             if (!(v->sr_rows[i >> 1][i & 1] = av_malloc(v->output_width)))
-                return AVERROR(ENOMEM);
+                goto error;
     }
 
     ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp,



More information about the ffmpeg-cvslog mailing list