xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86xvmc.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 75408f53d4e203e462b2f13ea4b06264f0e59ad2
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Wed Jan 24 12:28:38 2018 +0100

    xf86XvMCScreenInit: Clear pScreenPriv->dixinfo when freeing pAdapt
    
    Fixes double-free later in xf86XvMCCloseScreen, which would generally
    cause fireworks.
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

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;
         }