[Git][xorg-team/lib/libx11][debian-unstable] 8 commits:

[Timo Aaltonen]

Timo Aaltonen pushed to branch debian-unstable at X Strike Force / lib / libx11


Commits:
d0416863 by Bhavi Dhingra at 2018-09-22T23:21:14Z
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 <***@oracle.com>
Signed-off-by: Alan Coopersmith <***@oracle.com>

- - - - -
406afe4b by Michel Dänzer at 2018-09-25T15:10:58Z
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 <***@gmail.com>
Bugzilla: https://bugs.freedesktop.org/108008
Bugzilla: https://bugs.freedesktop.org/107992
Reviewed-by: Adam Jackson <***@redhat.com>

- - - - -
823a0f8a by Michel Dänzer at 2018-09-28T15:24:17Z
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 <***@znc.in>
Reviewed-by: Uli Schlachter <***@znc.in>

- - - - -
f3c97847 by Matt Turner at 2018-10-09T14:26:12Z
libX11 1.6.7

Signed-off-by: Matt Turner <***@gmail.com>

- - - - -
561fbe5f by Timo Aaltonen at 2018-10-09T14:56:21Z
Merge branch 'upstream-unstable' into debian-unstable

- - - - -
161ac024 by Timo Aaltonen at 2018-10-09T14:59:32Z
update the changelog

- - - - -
c2f87911 by Timo Aaltonen at 2018-10-09T15:03:06Z
upstream: Add key from Matt Turner.

- - - - -
8e864a1f by Timo Aaltonen at 2018-10-09T15:03:33Z
upload to unstable

- - - - -


5 changed files:

- configure.ac
- debian/changelog
- debian/upstream/signing-key.asc
- src/xcb_io.c
- src/xcms/cmsLkCol.c


Changes:

=====================================
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])


=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+libx11 (2:1.6.7-1) unstable; urgency=medium
+
+ * New upstream release.
+ - fix video freezing in firefox with amdgpu
+ * upstream: Add key from Matt Turner.
+
+ -- Timo Aaltonen <***@debian.org> Tue, 09 Oct 2018 18:03:26 +0300
+
libx11 (2:1.6.6-1) unstable; urgency=medium

* New upstream release.


=====================================
debian/upstream/signing-key.asc
=====================================
@@ -211,3 +211,110 @@ g5EXB3ShUaCfZZwnjzkCiKmva5JlOFWVXXDu5tAwS2oV0EJucraV7z2QW3vhNSOQ
91c+amYo/Z7vkRnDyZPLlsoOlcRNjr5U4/lYyS0AJS/RDZ0=
=IcP4
-----END PGP PUBLIC KEY BLOCK-----
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+TY6+VOP5WMktACUv0Q2d
+=FUgf
+-----END PGP PUBLIC KEY BLOCK-----


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



=====================================
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.



View it on GitLab: https://salsa.debian.org/xorg-team/lib/libx11/compare/153e24a2715b28411d5246f939900520c241a717...8e864a1f471d12d2d2bb1b5bb2c924f449079c31