XlibInt: check for XlibError before accessing other dpy fields

This fixes an assertion being triggered on reconnect: assertion=assertion@entry=0x7f2f0bba6510 "(dpy->flags & XlibDisplayPrivSync) != 0", file=file@entry=0x7f2f0bba62fc "XlibInt.c", line=line@entry=895,

XlibInt: check for XlibError before accessing other dpy fields
633f4617 · Ulrich Sibiller · Mike Gabriel · a61b1a72 · 633f4617
Commit 633f4617 authored Oct 31, 2018 by Ulrich Sibiller Committed by Mike Gabriel Dec 22, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

XlibInt.c nx-X11/lib/src/XlibInt.c +10 -0

No files found.
--- a/nx-X11/lib/src/XlibInt.c
+++ b/nx-X11/lib/src/XlibInt.c
@@ -892,6 +892,16 @@ void _XSeqSyncFunction(
 static int
 _XPrivSyncFunction (Display *dpy)
 {
+#ifdef NX_TRANS_SOCKET
+    if (dpy->flags & XlibDisplayIOError)
+    {
+#ifdef NX_TRANS_DEBUG
+        fprintf(stderr, "%s: Returning 0 with I/O error detected.\n", __func__);
+#endif
+        return 0;
+    }
+#endif /* NX_TRANS_SOCKET */
+
 #ifdef XTHREADS
    assert(!dpy->lock_fns);
 #endif