xserver: Branch 'master'

[GitLab Mirror]

 hw/xwayland/xwayland-vidmode.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6748a4094158d2bde1630b915a5318f9f22c8e0a
Author: SimonP <simonp.git at gmail.com>
Date:   Tue Jun 9 13:26:48 2020 +0200

    xwayland: Initialise values in xwlVidModeGetGamma()
    
    ProcVidModeGetGamma() relies on GetGamma() to initialise values if it
    returns TRUE. Without this, we're sending uninitialised values to
    clients.
    
    Fixes: xorg/xserver#1040

diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c
index 100ccb411..87e9c3d73 100644
--- a/hw/xwayland/xwayland-vidmode.c
+++ b/hw/xwayland/xwayland-vidmode.c
@@ -404,6 +404,7 @@ static Bool
 xwlVidModeGetGamma(ScreenPtr pScreen, float *red, float *green, float *blue)
 {
     /* Unsupported for now, but pretend it works */
+    *red = *green = *blue = 1.0f;
     return TRUE;
 }