From 0a1fc392b4cc45985d95eb6563f496a74bb3b306 Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Thu, 12 Jul 2012 19:04:57 +0300 Subject: [PATCH] vo_vdpau: fix possible crash after preemption Preemption recovery code could change the vc->vdp pointer when recreating the VDPAU device. However, some other code cached the value of vc->vdp in local variables over calls to handle_preemption(), and could then crash when using the stale value later. Make the device creation code keep the same vc->vdp instead of freeing and reallocating it, so that the old pointer value is never invalidated now. --- libvo/vo_vdpau.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c index a99cfeea7d..36ca7ab84b 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -456,9 +456,11 @@ static int win_x11_init_vdpau_procs(struct vo *vo) { struct vo_x11_state *x11 = vo->x11; struct vdpctx *vc = vo->priv; - talloc_free(vc->vdp); // In case this is reinitialization after preemption - struct vdp_functions *vdp = talloc_zero(vc, struct vdp_functions); - vc->vdp = vdp; + if (vc->vdp) // reinitialization after preemption + memset(vc->vdp, 0, sizeof(*vc->vdp)); + else + vc->vdp = talloc_zero(vc, struct vdp_functions); + struct vdp_functions *vdp = vc->vdp; VdpStatus vdp_st; struct vdp_function { -- 2.11.4.GIT