From 1d2d649281ce4db792c40c2dd0ccf4b043a486f3 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 1 Nov 2015 22:55:43 +0100 Subject: vdpau: fix uninit when init fails The uninit() function was called twice if the uninit() function failed (once by init(), once by vd_lavc.c code), which caused crashes due to double-free. (This failure is a corner case, and all other hwdec backends appear to handle this case gracefully.) I do not think this code should be able to deal with uninit() being called other than once. Guarantee that it's called exactly once. --- video/decode/vd_lavc.c | 1 + 1 file changed, 1 insertion(+) (limited to 'video/decode/vd_lavc.c') diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index cdd0dd8884..9ce657bb5c 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -456,6 +456,7 @@ static void uninit_avctx(struct dec_video *vd) if (ctx->hwdec && ctx->hwdec->uninit) ctx->hwdec->uninit(ctx); + ctx->hwdec = NULL; av_freep(&ctx->avctx); -- cgit v1.2.3