xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Thu Jul 29 12:03:40 PDT 2010
hw/xquartz/pbproxy/main.m | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 750d4e82a0c1161292d24216bcff200cd6647611
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date: Thu Jul 29 11:39:40 2010 -0700
XQuartz: xpbproxy: Don't take down the whole server on an IO error
Calls pthread_exit to prevent _XIOError from calling exit()
This fixes http://xquartz.macosforge.org/trac/ticket/421
Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
diff --git a/hw/xquartz/pbproxy/main.m b/hw/xquartz/pbproxy/main.m
index 560cf01..bb06465 100644
--- a/hw/xquartz/pbproxy/main.m
+++ b/hw/xquartz/pbproxy/main.m
@@ -75,6 +75,8 @@ static int x_io_error_handler (Display *dpy) {
exit(EXIT_FAILURE);
#endif
+ /* Prevent _XIOError from calling exit() */
+ pthread_exit(NULL);
return 0;
}
More information about the xorg-commit
mailing list