summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <tpearson@raptorengineering.com>2019-03-02 19:57:22 -0600
committerTimothy Pearson <tpearson@raptorengineering.com>2019-03-02 19:57:37 -0600
commitc5bab5b98a826ef472cd9b814d2dfee2dc76ed20 (patch)
tree1220036e8a8db88d6bf655451b978417a1aa933c
parent98d614012977946d61d56ac0e44f3c7708e40ba0 (diff)
downloadxrdp-proprietary-c5bab5b98a826ef472cd9b814d2dfee2dc76ed20.tar.gz
xrdp-proprietary-c5bab5b98a826ef472cd9b814d2dfee2dc76ed20.zip
Work around crash in clipboard
-rw-r--r--sesman/chansrv/clipboard.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sesman/chansrv/clipboard.c b/sesman/chansrv/clipboard.c
index a690e5e2..e91c1cde 100644
--- a/sesman/chansrv/clipboard.c
+++ b/sesman/chansrv/clipboard.c
@@ -376,6 +376,12 @@ clipboard_init(void)
return 0;
}
+ if (!g_display)
+ {
+ // prevent crash in XInternAtom
+ return 3;
+ }
+
xfuse_init();
xcommon_init();
g_incr_max_req_size = XMaxRequestSize(g_display) * 4 - 24;