Update to libX11 1.6.7

6 files changed, 128 insertions, 56 deletions

diff --git a/lib/libX11/ChangeLog b/lib/libX11/ChangeLog
index 90c1ed50f..91822ba6d 100644
--- a/lib/libX11/ChangeLog
+++ b/lib/libX11/ChangeLog
@@ -1,3 +1,60 @@
+commit f3c978476e0be6813268af494efb7ac507451116
+Author: Matt Turner <mattst88@gmail.com>
+Date:   Tue Oct 9 10:26:05 2018 -0400
+
+    libX11 1.6.7
+    
+    Signed-off-by: Matt Turner <mattst88@gmail.com>
+
+commit 823a0f8a820247b6c1e092f679b49cbdc2ea5c95
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Fri Sep 28 17:24:17 2018 +0200
+
+    poll_for_event: Allow using xcb_poll_for_queued_event
+    
+    It avoids reading from the display connection again in cases where that
+    was already done.
+    
+    Suggested-by: Uli Schlachter <psychon@znc.in>
+    Reviewed-by: Uli Schlachter <psychon@znc.in>
+
+commit 406afe4b0f1b655c0db19bbc9a0c48da9a46acf5
+Author: Michel Dänzer <michel.daenzer@amd.com>
+Date:   Tue Sep 25 17:10:58 2018 +0200
+
+    poll_for_response: Call poll_for_event again if xcb_poll_for_reply fails
+    
+    If xcb_poll_for_reply fails to find a reply, poll_for_response would
+    always return NULL. However, xcb_poll_for_reply may have read events
+    from the display connection while looking for a reply. In that case,
+    returning NULL from poll_for_response is wrong and can result in the
+    client hanging, e.g. because it returns to waiting for the display
+    connection file descriptor becoming readable after XPending incorrectly
+    returned 0 pending events.
+    
+    The solution is to call poll_for_event again after xcb_poll_for_reply
+    returned 0. This will return the first of any events read by
+    xcb_poll_for_reply.
+    
+    Fixes issue #79.
+    
+    Reported-by: Yuxuan Shui <yshuiv7@gmail.com>
+    Bugzilla: https://bugs.freedesktop.org/108008
+    Bugzilla: https://bugs.freedesktop.org/107992
+    Reviewed-by: Adam Jackson <ajax@redhat.com>
+
+commit d0416863d5bf75af54ce81f6c30d4c1476b5e04f
+Author: Bhavi Dhingra <b.dhingra@samsung.com>
+Date:   Mon Sep 28 08:33:40 2015 +0000
+
+    XcmsLookupColor: fully initialize XColor structs passed to _XColor_to_XcmsRGB
+    
+    Fixes https://gitlab.freedesktop.org/xorg/lib/libx11/issues/44
+    aka https://bugs.freedesktop.org/show_bug.cgi?id=92154
+    
+    Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+    Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
 commit 733f64bfeb311c1d040b2f751bfdef9c9d0f89ef
 Author: Matthieu Herrb <matthieu@herrb.eu>
 Date:   Tue Aug 21 16:54:50 2018 +0200
@@ -235,7 +292,7 @@ Date:   Sat Jun 4 17:19:59 2016 +0200
     
     Fixes: warning: variable 'req' set but not used [-Wunused-but-set-variable]
            by marking req _X_UNUSED
-    	Solution was discussed on xorg-devel ML
+            Solution was discussed on xorg-devel ML
            Peter Hutter, Alan Coopersmith
             Re: [PATCH libX11 3/5] fix: warning: pointer targets in passing argument 2 of '_XSend' differ in signedness [-Wpointer-sign]
     
@@ -4418,9 +4475,9 @@ Date:   Sat May 21 07:29:38 2011 +0200
     
     Aliases to itself don't make much sense.
     This changes occurances of:
-    xy_UV.UTF-8:			xy_UV.UTF-8
+    xy_UV.UTF-8:                    xy_UV.UTF-8
     to
-    xy_UV:			xy_UV.UTF-8
+    xy_UV:                  xy_UV.UTF-8
     where applicable.
     
     Signed-off-by: Egbert Eich <eich@freedesktop.org>
@@ -4930,7 +4987,7 @@ Date:   Sun Feb 19 13:27:38 2012 +0100
     
     Conflicts:
     
-    	src/OpenDis.c
+            src/OpenDis.c
 
 commit f4378193619baa9bb973c1b5b718721bbcbe92c7
 Author: James Cloos <cloos@jhcloos.com>
@@ -5381,8 +5438,8 @@ Date:   Tue Oct 4 17:11:11 2011 -0400
     ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
     ┃ Clash with existing sequence in iso8859-1/Compose.pre
     ┃  on line 661: Ctrl<T> <A> <A>
-    ┃    line #661: Ctrl<T> <A> <A>		: "\305"	Aring
-    ┃    line #480: Ctrl<T> <A> <A>		: "@"	at
+    ┃    line #661: Ctrl<T> <A> <A>         : "\305"        Aring
+    ┃    line #480: Ctrl<T> <A> <A>         : "@"   at
     ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
     
     Signed-off-by: James Cloos <cloos@jhcloos.com>
@@ -7948,7 +8005,7 @@ Date:   Mon Jul 12 13:38:04 2010 -0700
     
     Translation performed by:
      perl -i -p -e 's{\<\!-- .hN (\S+) (\S+)?\s*-->}
-    	         {&lt;<filename class="headerfile">$1</filename>&gt;$2}' *.xml
+                     {&lt;<filename class="headerfile">$1</filename>&gt;$2}' *.xml
     
     Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
 
@@ -8425,7 +8482,7 @@ Date:   Wed May 12 16:42:18 2010 -0700
     Reviewed-by: Jamey Sharp <jamey@minilop.net>
 
 commit fd82552d5c0ce1931f29006a0c36f5e03cf8577e
-Merge: aae2a4a 933aee1
+Merge: aae2a4a7 933aee1d
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Mon May 10 16:51:24 2010 -0700
 
@@ -10447,7 +10504,7 @@ Date:   Thu Jan 29 20:25:15 2009 -0200
     Bug #17946, attachment #19443
     
     This patch avoids the gcc warning
-    	../../../../libX11-1.1.5/modules/im/ximcp/imDefLkup.c:223: warning: passing arg 1 of `_XimProcSyncReply' from incompatible pointer type
+            ../../../../libX11-1.1.5/modules/im/ximcp/imDefLkup.c:223: warning: passing arg 1 of `_XimProcSyncReply' from incompatible pointer type
     (same as already done at other places)
     
     BTW: what is the difference between XIM (the type of ic->core.im)
@@ -10463,8 +10520,8 @@ Date:   Thu Jan 29 20:22:21 2009 -0200
     Bug #17946, attachment #19441
     
     This patch avoids the two gcc warnings
-    	../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:413: warning: assignment discards qualifiers from pointer target type
-    	../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:450: warning: assignment discards qualifiers from pointer target type
+            ../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:413: warning: assignment discards qualifiers from pointer target type
+            ../../../../libX11-1.1.5/modules/im/ximcp/imRm.c:450: warning: assignment discards qualifiers from pointer target type
     
     Note, that this as a rather crude fix of the problem (and it is really a
     shame to cast name_table to non-const).
@@ -10483,7 +10540,7 @@ Date:   Thu Jan 29 20:20:18 2009 -0200
     Bug #17946, attachment #19440
     
     Avoid a preprocessor message
-    	<stdin>:194: warning: no newline at end of file
+            <stdin>:194: warning: no newline at end of file
     
     Two more such warnings (in XkbSAGroup.man and XkbSASetGroup.man)
     seem to be caused by a truncated (or otherwise incomplete)
@@ -10502,10 +10559,10 @@ Date:   Thu Jan 29 20:12:24 2009 -0200
     option, e.g. -DX11_t, not as empty.
     
     This avoids the gcc (3.4.6) warnings:
-    	../../libX11-1.1.5/src/x11_trans.c:27:1: warning: "X11_t" redefined
-    	<command line>:7:1: warning: this is the location of the previous definition
-    	../../libX11-1.1.5/src/x11_trans.c:28:1: warning: "TRANS_CLIENT" redefined
-    	<command line>:8:1: warning: this is the location of the previous definition
+            ../../libX11-1.1.5/src/x11_trans.c:27:1: warning: "X11_t" redefined
+            <command line>:7:1: warning: this is the location of the previous definition
+            ../../libX11-1.1.5/src/x11_trans.c:28:1: warning: "TRANS_CLIENT" redefined
+            <command line>:8:1: warning: this is the location of the previous definition
     
     Similarly, follow the autoconf convention to define XTHREADS
     and XUSE_MTSAFE_API as one.
@@ -11121,7 +11178,7 @@ Date:   Tue Jun 10 20:07:30 2008 +0300
     Add some Khmer digraphs to all locales with a Compose.pre.
 
 commit e54cffb649b1622c17457e470cfab8cc56d38c97
-Merge: 19802cc 721b574
+Merge: 19802ccd 721b574d
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Tue Jun 10 20:04:30 2008 +0300
 
@@ -11140,7 +11197,7 @@ Date:   Wed May 28 17:31:59 2008 +0930
     Require xproto 7.0.13 and libxcb 1.1.90 (for GenericEvents)
 
 commit e9195db7257e418f83707233baeeb84b225caf4f
-Merge: c34f76f a7f8556
+Merge: c34f76f4 a7f85567
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu May 22 12:14:28 2008 +0930
 
@@ -11176,7 +11233,7 @@ Date:   Mon May 12 21:46:24 2008 +0930
     Build with xcb as transport layer highly recommended.
 
 commit c9b2ff1e6a607463993afa4a8d085857d97cc2f3
-Merge: 17d7dcb 9129057
+Merge: 17d7dcbf 9129057b
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Mon May 12 17:58:37 2008 +0930
 
@@ -11383,7 +11440,7 @@ Date:   Sat Dec 22 21:45:23 2007 +0100
     X.Org bug#13786 <http://bugs.freedesktop.org/show_bug.cgi?id=13786>
 
 commit 32115c563b87d2f37e3f9de70fbd0f4d9e424aea
-Merge: 8f0bd3f e8d4cef
+Merge: 8f0bd3f4 e8d4cefa
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Fri Dec 14 22:43:47 2007 -0500
 
@@ -11414,14 +11471,14 @@ Date:   Mon Dec 10 23:00:44 2007 -0800
     Added launchd support.
 
 commit 17d7dcbfced4a9417b33507bd3fd9b7dd8268242
-Merge: 5dfefd3 13ac804
+Merge: 5dfefd38 13ac8046
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Dec 6 14:08:29 2007 +1030
 
     Merge branch 'master' into xge
 
 commit 5dfefd3829d3ba7e41d5db0ad28e9dfee92fadd5
-Merge: a68a1cd eff33ae
+Merge: a68a1cd7 eff33ae5
 Author: Peter Hutterer <peter@cs.unisa.edu.au>
 Date:   Thu Dec 6 13:57:09 2007 +1030
 
@@ -11429,7 +11486,7 @@ Date:   Thu Dec 6 13:57:09 2007 +1030
     
     Conflicts:
     
-    	src/xcb_io.c
+            src/xcb_io.c
 
 commit 13ac80469f6958cabac596834e203bd9cb6d4c94
 Author: James Cloos <cloos@jhcloos.com>
@@ -11477,7 +11534,7 @@ Date:   Tue Dec 4 17:25:39 2007 -0500
     2] https://bugs.freedesktop.org/show_bug.cgi?id=5129
 
 commit 02e04059c89e175f51647e3b031344f743286b34
-Merge: 1254c57 b57129e
+Merge: 1254c57d b57129ef
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Tue Dec 4 06:55:04 2007 -0500
 
@@ -11655,7 +11712,7 @@ Date:   Tue Jan 2 08:40:00 2007 -0800
     X.Org Bugzilla #9516 <https://bugs.freedesktop.org/show_bug.cgi?id=9516>
 
 commit d8fe979fc929833e8c754aed32641786d5a0622b
-Merge: 21ca953 4ec1723
+Merge: 21ca9533 4ec1723f
 Author: James Cloos <cloos@jhcloos.com>
 Date:   Mon Aug 20 15:34:50 2007 -0400
 
@@ -12275,7 +12332,7 @@ Date:   Sat Dec 16 00:45:19 2006 +0200
     Since XlibConf.h is built by configure, don't distribute it.
 
 commit dd1705ced2cac6b4b6b21e79272fcf9bed4bf376
-Merge: 129bbb9 769b985
+Merge: 129bbb9f 769b9854
 Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
 Date:   Thu Dec 14 14:23:20 2006 -0600
 
@@ -12515,7 +12572,7 @@ Date:   Sat Oct 7 21:00:36 2006 -0700
     Release libX11 1.1 RC1 (1.0.99.1).
 
 commit bf237409c5fce32c557d298f62f44d456c2b5bc8
-Merge: ba47719 2d426d1
+Merge: ba477191 2d426d1f
 Author: Jamey Sharp <jamey@minilop.net>
 Date:   Sat Oct 7 21:07:16 2006 -0700
 
@@ -12952,7 +13009,7 @@ Date:   Sat Jun 3 13:51:51 2006 +0300
     (cherry picked from e3acee88cfcc4ef0fa8a7db39763a5ebe2e985cb commit)
 
 commit c336eb6b80a6f91da1d0b3d28634a2cfde324670
-Merge: 33556ca ad9ebbd
+Merge: 33556ca8 ad9ebbd2
 Author: Donnie Berkholz <donnie@comet.(none)>
 Date:   Thu Jun 22 14:25:35 2006 -0700
 
@@ -12965,14 +13022,14 @@ Date:   Thu Jun 22 17:20:59 2006 +0300
     Bump to 1.0.99.0 to avoid confusion.
 
 commit efedfd68e31bcee2d21ac340be8dc9e1825ec890
-Merge: e3acee8 4b8eb5d
+Merge: e3acee88 4b8eb5d4
 Author: Daniel Stone <daniel@fooishbar.org>
 Date:   Thu Jun 22 16:53:45 2006 +0300
 
     Merge branch 'master' of git+ssh://git.freedesktop.org/srv/git.freedesktop.org/git/xorg/lib/libX11
 
 commit 4b8eb5d4a1da73a94b5a6ab12e34784aae4c79c5
-Merge: 5169d0e eff50c9
+Merge: 5169d0e0 eff50c94
 Author: Matthieu Herrb <matthieu@deville.herrb.com>
 Date:   Tue Jun 20 21:05:15 2006 +0200
 
@@ -13305,7 +13362,7 @@ Date:   Wed May 10 14:51:37 2006 +0300
     Fix typo (be_BG.UTF-8 rather than bg_BG.UTF-8) in locale.alias.pre.
 
 commit 9cac8c9824874ca7d835f001a4efa910b7fdd822
-Merge: 19b8840 e514bc8
+Merge: 19b8840a e514bc87
 Author: Daniel Stone <daniels@preemptive.fooishbar.org>
 Date:   Wed May 10 14:50:37 2006 +0300
 
@@ -13398,7 +13455,7 @@ Date:   Fri Mar 17 15:58:39 2006 +0200
     Properly clip bounds when only one point is defining an outline.
 
 commit e876efb8aa410f2f5c87aaaa7042f847c4ff96f7
-Merge: be266b2 f71ea0b
+Merge: be266b20 f71ea0bc
 Author: Matthieu Herrb <matthieu@bluenote.herrb.com>
 Date:   Sat Mar 11 15:40:35 2006 +0100
 
diff --git a/lib/libX11/compile b/lib/libX11/compile
index a85b723c7..2ab71e4ea 100644
--- a/lib/libX11/compile
+++ b/lib/libX11/compile
@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -342,6 +343,6 @@ exit $ret
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:
diff --git a/lib/libX11/configure b/lib/libX11/configure
index bb9ec330d..83d85a9ab 100644
--- a/lib/libX11/configure
+++ b/lib/libX11/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for libX11 1.6.6.
+# Generated by GNU Autoconf 2.69 for libX11 1.6.7.
 #
 # Report bugs to <https://gitlab.freedesktop.org/xorg/lib/libx11/issues>.
 #
@@ -651,8 +651,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libX11'
 PACKAGE_TARNAME='libX11'
-PACKAGE_VERSION='1.6.6'
-PACKAGE_STRING='libX11 1.6.6'
+PACKAGE_VERSION='1.6.7'
+PACKAGE_STRING='libX11 1.6.7'
 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/lib/libx11/issues'
 PACKAGE_URL=''
 
@@ -1510,7 +1510,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libX11 1.6.6 to adapt to many kinds of systems.
+\`configure' configures libX11 1.6.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1580,7 +1580,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libX11 1.6.6:";;
+     short | recursive ) echo "Configuration of libX11 1.6.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1746,7 +1746,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libX11 configure 1.6.6
+libX11 configure 1.6.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2272,7 +2272,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libX11 $as_me 1.6.6, which was
+It was created by libX11 $as_me 1.6.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -4490,7 +4490,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libX11'
- VERSION='1.6.6'
+ VERSION='1.6.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -21406,7 +21406,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libX11 $as_me 1.6.6, which was
+This file was extended by libX11 $as_me 1.6.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21472,7 +21472,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libX11 config.status 1.6.6
+libX11 config.status 1.6.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/lib/libX11/configure.ac b/lib/libX11/configure.ac
index 56fd2cb38..309084536 100644
--- a/lib/libX11/configure.ac
+++ b/lib/libX11/configure.ac
@@ -1,7 +1,7 @@
 
 # Initialize Autoconf
 AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.6],
+AC_INIT([libX11], [1.6.7],
         [https://gitlab.freedesktop.org/xorg/lib/libx11/issues], [libX11])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
diff --git a/lib/libX11/src/xcb_io.c b/lib/libX11/src/xcb_io.c
index 649c82008..6a12d1501 100644
--- a/lib/libX11/src/xcb_io.c
+++ b/lib/libX11/src/xcb_io.c
@@ -230,7 +230,7 @@ static void widen(uint64_t *wide, unsigned int narrow)
  * variable for that thread to process the response and wake us up.
  */
 
-static xcb_generic_reply_t *poll_for_event(Display *dpy)
+static xcb_generic_reply_t *poll_for_event(Display *dpy, Bool queued_only)
 {
 	/* Make sure the Display's sequence numbers are valid */
 	require_socket(dpy);
@@ -238,8 +238,12 @@ static xcb_generic_reply_t *poll_for_event(Display *dpy)
 	/* Precondition: This thread can safely get events from XCB. */
 	assert(dpy->xcb->event_owner == XlibOwnsEventQueue && !dpy->xcb->event_waiter);
 
-	if(!dpy->xcb->next_event)
-		dpy->xcb->next_event = xcb_poll_for_event(dpy->xcb->connection);
+	if(!dpy->xcb->next_event) {
+		if(queued_only)
+			dpy->xcb->next_event = xcb_poll_for_queued_event(dpy->xcb->connection);
+		else
+			dpy->xcb->next_event = xcb_poll_for_event(dpy->xcb->connection);
+	}
 
 	if(dpy->xcb->next_event)
 	{
@@ -271,12 +275,21 @@ static xcb_generic_reply_t *poll_for_response(Display *dpy)
 	void *response;
 	xcb_generic_error_t *error;
 	PendingRequest *req;
-	while(!(response = poll_for_event(dpy)) &&
+	while(!(response = poll_for_event(dpy, False)) &&
 	      (req = dpy->xcb->pending_requests) &&
-	      !req->reply_waiter &&
-	      xcb_poll_for_reply64(dpy->xcb->connection, req->sequence, &response, &error))
+	      !req->reply_waiter)
 	{
-		uint64_t request = X_DPY_GET_REQUEST(dpy);
+		uint64_t request;
+
+		if(!xcb_poll_for_reply64(dpy->xcb->connection, req->sequence,
+					 &response, &error)) {
+			/* xcb_poll_for_reply64 may have read events even if
+			 * there is no reply. */
+			response = poll_for_event(dpy, True);
+			break;
+		}
+
+		request = X_DPY_GET_REQUEST(dpy);
 		if(XLIB_SEQUENCE_COMPARE(req->sequence, >, request))
 		{
 			throw_thread_fail_assert("Unknown sequence number "
@@ -617,7 +630,7 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard)
 			{ /* need braces around ConditionWait */
 				ConditionWait(dpy, dpy->xcb->event_notify);
 			}
-			while((event = poll_for_event(dpy)))
+			while((event = poll_for_event(dpy, True)))
 				handle_response(dpy, event, True);
 		}
 
diff --git a/lib/libX11/src/xcms/cmsLkCol.c b/lib/libX11/src/xcms/cmsLkCol.c
index 15e987424..a81c4cbf0 100644
--- a/lib/libX11/src/xcms/cmsLkCol.c
+++ b/lib/libX11/src/xcms/cmsLkCol.c
@@ -76,7 +76,8 @@ XcmsLookupColor (
     register int n;
     xLookupColorReply reply;
     register xLookupColorReq *req;
-    XColor def, scr;
+    XColor def = {0,};
+    XColor scr = {0,};
 
 /*
  * 0. Check for invalid arguments.