frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A couple more cases of error message before freeing strings.

This commit is contained in:
Eric Anholt 2006-11-07 15:48:05 -08:00
parent 05f1c30246
commit 5a40448f2d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.c
View File

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