summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2018-01-24 12:28:38 +0100
committerAdam Jackson <ajax@redhat.com>2018-02-12 14:49:50 -0500
commitdf319f889ddc952dd065bbb3252d045b90baaf8e (patch)
treeec461c83c6a3d2e9dea42211d66fc6bbfbf8d1e7 /hw
parentd0d1a694f967af770fba0d36043fd5218ff20984 (diff)
xf86XvMCScreenInit: Clear pScreenPriv->dixinfo when freeing pAdapt
Fixes double-free later in xf86XvMCCloseScreen, which would generally cause fireworks. Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> (cherry picked from commit 75408f53d4e203e462b2f13ea4b06264f0e59ad2)
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/common/xf86xvmc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/xfree86/common/xf86xvmc.c b/hw/xfree86/common/xf86xvmc.c
index a0a94c74b..c67418bf4 100644
--- a/hw/xfree86/common/xf86xvmc.c
+++ b/hw/xfree86/common/xf86xvmc.c
@@ -187,6 +187,7 @@ xf86XvMCScreenInit(ScreenPtr pScreen,
}
if (!pAdapt[i].xv_adaptor) {
/* no adaptor by that name */
+ pScreenPriv->dixinfo = FALSE;
free(pAdapt);
return FALSE;
}