[X2Go-Commits] [nx-libs] 37/51: XlibInt: check for XlibError before accessing other dpy fields

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit 633f4617b6720bcac8e0ead9e46fd14b60d598e6
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Wed Oct 31 23:44:15 2018 +0100

    XlibInt: check for XlibError before accessing other dpy fields
    
    This fixes an assertion being triggered on reconnect:
    
    assertion=assertion at entry=0x7f2f0bba6510 "(dpy->flags & XlibDisplayPrivSync) != 0", file=file at entry=0x7f2f0bba62fc "XlibInt.c", line=line at entry=895,
---
 nx-X11/lib/src/XlibInt.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/nx-X11/lib/src/XlibInt.c b/nx-X11/lib/src/XlibInt.c
index 88698da..36e6501 100644
--- 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

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git