aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald Bultje <rsbultje@gmail.com>2013-01-10 11:02:57 -0800
committerLuca Barbato <lu_zero@gentoo.org>2013-01-11 02:17:09 +0100
commitebd3aa429c38d199f5ee9f578030a3bc6e50056b (patch)
tree9d37fafa27c6975175da308bef6df1b2529ccc6b
parent0135dd73bb23060b896b06f2ecbb05435224f492 (diff)
downloadffmpeg-ebd3aa429c38d199f5ee9f578030a3bc6e50056b.tar.gz
vp3: Fix double free in vp3_decode_end()
Signed-off-by: Dale Curtis <dalecurtis@chromium.org> Signed-off-by: Luca Barbato <lu_zero@gentoo.org> (cherry picked from commit ec86ba57312745fd7ad9771e3121e79c6aacba30) Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
-rw-r--r--libavcodec/vp3.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 6e85b90964..bdd4289a49 100644
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -281,15 +281,15 @@ static av_cold int vp3_decode_end(AVCodecContext *avctx)
Vp3DecodeContext *s = avctx->priv_data;
int i;
- av_free(s->superblock_coding);
- av_free(s->all_fragments);
- av_free(s->coded_fragment_list[0]);
- av_free(s->dct_tokens_base);
- av_free(s->superblock_fragments);
- av_free(s->macroblock_coding);
- av_free(s->motion_val[0]);
- av_free(s->motion_val[1]);
- av_free(s->edge_emu_buffer);
+ av_freep(&s->superblock_coding);
+ av_freep(&s->all_fragments);
+ av_freep(&s->coded_fragment_list[0]);
+ av_freep(&s->dct_tokens_base);
+ av_freep(&s->superblock_fragments);
+ av_freep(&s->macroblock_coding);
+ av_freep(&s->motion_val[0]);
+ av_freep(&s->motion_val[1]);
+ av_freep(&s->edge_emu_buffer);
if (avctx->internal->is_copy)
return 0;