xserver: Branch 'master'
Aaron Plattner
aplattner at kemper.freedesktop.org
Thu Sep 20 16:22:44 PDT 2007
config/dbus-core.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
diff-tree 3a965fdadccea7beff09a28c9c0ef4b4975eae38 (from 50fa8722d35c12e5f0322cebe25faf99c39d4f50)
Author: Aaron Plattner <aplattner at nvidia.com>
Date: Thu Sep 20 16:22:24 2007 -0700
Don't segfault on shutdown if we never managed to connect to dbus.
diff --git a/config/dbus-core.c b/config/dbus-core.c
index 2888159..eab72a5 100644
--- a/config/dbus-core.c
+++ b/config/dbus-core.c
@@ -87,7 +87,8 @@ teardown(void)
dbus_connection_unref(bus_info.connection);
RemoveBlockAndWakeupHandlers(block_handler, wakeup_handler, &bus_info);
- RemoveGeneralSocket(bus_info.fd);
+ if (bus_info.fd != -1)
+ RemoveGeneralSocket(bus_info.fd);
bus_info.fd = -1;
bus_info.connection = NULL;
More information about the xorg-commit
mailing list