xserver: Branch 'master'

[Eric Anholt]

 config/config.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree 5a40448f2d0ac2c86c617bebe3fb649174bf0d7f (from 05f1c302460a14c8fa9a943a12d69adcd3c30d58)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Nov 7 15:48:05 2006 -0800

    A couple more cases of error message before freeing strings.

diff --git a/config/config.c b/config/config.c
index d597222..b95128d 100644
--- a/config/config.c
+++ b/config/config.c
@@ -274,23 +274,23 @@ configInitialise()
     snprintf(busname, sizeof(busname), "org.x.config.display%d", atoi(display));
     if (!dbus_bus_request_name(bus, busname, 0, &error) ||
         dbus_error_is_set(&error)) {
-        dbus_error_free(&error);
         dbus_connection_unref(bus);
         configfd = -1;
         FatalError("[dbus] couldn't take over org.x.config: %s (%s)\n",
                    error.name, error.message);
+        dbus_error_free(&error);
         return;
     }
 
     /* blocks until we get a reply. */
     dbus_bus_add_match(bus, MATCH_RULE, &error);
     if (dbus_error_is_set(&error)) {
-        dbus_error_free(&error);
         dbus_bus_release_name(bus, busname, &error);
         dbus_connection_unref(bus);
         configfd = -1;
         FatalError("[dbus] couldn't match X.Org rule: %s (%s)\n", error.name,
                    error.message);
+        dbus_error_free(&error);
         return;
     }