Merge branch 'uli42-pr/fix_xlibcrash' into 3.6.x

Attributes GH PR #754: https://github.com/ArcticaProject/nx-libs/pull/754

Merge branch 'uli42-pr/fix_xlibcrash' into 3.6.x
4214a719 · Mike Gabriel · d9825596 · 633f4617 · 4214a719
Unverified Commit 4214a719 authored Dec 22, 2018 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 1 deletion

XlibInt.c nx-X11/lib/src/XlibInt.c +11 -1

No files found.
--- a/nx-X11/lib/src/XlibInt.c
+++ b/nx-X11/lib/src/XlibInt.c
@@ -875,7 +875,7 @@ void _XSeqSyncFunction(
    if (dpy->flags & XlibDisplayIOError)
    {
 #ifdef NX_TRANS_DEBUG
-        fprintf(stderr, "_XSeqSyncFunction: Returning 0 with I/O error detected.\n");
+        fprintf(stderr, "_XSeqSyncFunction: Returning with I/O error detected.\n");
 #endif
        return;
    }
@@ -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