xserver: Branch 'master'

[Keith Packard]

 dix/property.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit fa2bc06407665ee074f5914d0f83d4114b20fc8e
Author: Keith Packard <keithp at keithp.com>
Date:   Fri Aug 12 17:40:55 2016 -0700

    dix: Avoid writing uninitialized bytes in deliverPropertyNotifyEvent
    
    Make sure the whole event is initialized, instead of leaving the pad
    bytes unset.
    
    Signed-off-by: Keith Packard <keithp at keithp.com>
    Reviewed-by: Hans de Goede <hdegoede at redhat.com>

diff --git a/dix/property.c b/dix/property.c
index bde2af8..fa4da2d 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -110,10 +110,12 @@ deliverPropertyNotifyEvent(WindowPtr pWin, int state, Atom atom)
 {
     xEvent event;
     UpdateCurrentTimeIf();
-    event.u.property.window = pWin->drawable.id;
-    event.u.property.state = state;
-    event.u.property.atom = atom;
-    event.u.property.time = currentTime.milliseconds;
+    event = (xEvent) {
+        .u.property.window = pWin->drawable.id,
+        .u.property.state = state,
+        .u.property.atom = atom,
+        .u.property.time = currentTime.milliseconds,
+    };
     event.u.u.type = PropertyNotify;
     DeliverEvents(pWin, &event, 1, (WindowPtr) NULL);
 }