<div dir="ltr"><div class="gmail_default" style="font-family:arial,helvetica,sans-serif;font-size:small">+ Peter of course!</div></div><div class="gmail_extra"> <div class="gmail_quote">On 21 January 2016 at 09:58, Olivier Fourdan <<a href="mailto:ofourdan@redhat.com" target="_blank">ofourdan@redhat.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">XkbGetKeyboardByName relies on flags to read the data from the server. If the X server sends us the wrong flags or if a subreply is smaller than it should be, XkbGetKeyboardByName will not read all the available data and leave data in the buffer, which will cause the next _XReply() to fail with: [xcb] Extra reply data still left in queue [xcb] This is most likely caused by a broken X extension library [xcb] Aborting, sorry about that. xcb_io.c:576: _XReply: Assertion `!xcb_xlib_extra_reply_data_left' failed. Aborted Check if there is some extra data left at the end of XkbGetKeyboardByName() and discard that data if any is found. Many thanks to Peter Hutterer <<a href="mailto:peter.hutterer@who-t.net">peter.hutterer@who-t.net</a>> for finding the root cause of the issue and Adam Jackson <<a href="mailto:ajax@redhat.com">ajax@redhat.com</a>> for helping with the analysis! Signed-off-by: Olivier Fourdan <<a href="mailto:ofourdan@redhat.com">ofourdan@redhat.com</a>> --- src/xkb/XKBGetByName.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/xkb/XKBGetByName.c b/src/xkb/XKBGetByName.c index 973052c..01927fc 100644 --- a/src/xkb/XKBGetByName.c +++ b/src/xkb/XKBGetByName.c @@ -28,12 +28,23 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef HAVE_CONFIG_H #include <config.h> #endif +#include <stdio.h> + #include "Xlibint.h" #include <X11/extensions/XKBproto.h> #include "XKBlibint.h" /***====================================================================***/ +static void +_discardExtraLen(Display *dpy, int extraLen) +{ + fprintf(stderr, + "XkbGetKeyboardByName: server returned wrong data, discarding %i bytes\n", + extraLen); + _XEatData(dpy, extraLen); +} + XkbDescPtr XkbGetKeyboardByName(Display *dpy, unsigned deviceSpec, @@ -44,7 +55,7 @@ XkbGetKeyboardByName(Display *dpy, { register xkbGetKbdByNameReq *req; xkbGetKbdByNameReply rep; - int len, extraLen; + int len, extraLen = 0; char *str; XkbDescPtr xkb; int mapLen, codesLen, typesLen, compatLen; @@ -204,12 +215,16 @@ XkbGetKeyboardByName(Display *dpy, if (status != Success) goto BAILOUT; } + if (extraLen > 0) + _discardExtraLen(dpy, extraLen); UnlockDisplay(dpy); SyncHandle(); return xkb; BAILOUT: if (xkb != NULL) XkbFreeKeyboard(xkb, XkbAllComponentsMask, xTrue); + if (extraLen > 0) + _discardExtraLen(dpy, extraLen); UnlockDisplay(dpy); SyncHandle(); return NULL; -- 2.5.0 _______________________________________________ <a href="mailto:xorg-devel@lists.x.org">xorg-devel@lists.x.org</a>: X.Org development Archives: <a href="http://lists.x.org/archives/xorg-devel" rel="noreferrer" target="_blank">http://lists.x.org/archives/xorg-devel</a> Info: <a href="http://lists.x.org/mailman/listinfo/xorg-devel" rel="noreferrer" target="_blank">http://lists.x.org/mailman/listinfo/xorg-devel</a></blockquote></div> </div>