summaryrefslogtreecommitdiff
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-05-09 04:31:01 (GMT)
committer Alan Coopersmith <alan.coopersmith@sun.com>2009-05-09 04:31:01 (GMT)
commit1e816065e5ec3b9394dc1fa5815457a664e15fd9 (patch) (side-by-side diff)
treee2f65afb387bec42ad1e497ba367593d17bd0a00
parentb680bda34da130ce408783f04214771471e41e8d (diff)
downloadxserver-1e816065e5ec3b9394dc1fa5815457a664e15fd9.zip
xserver-1e816065e5ec3b9394dc1fa5815457a664e15fd9.tar.gz
Don't printf NULL pointers on HAL connection error
Fixes Solaris bug 6801386 Xorg core dumps on startup if hald not running http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=6801386 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--config/hal.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/config/hal.c b/config/hal.c
index 36fa839..731d9b8 100644
--- a/config/hal.c
+++ b/config/hal.c
@@ -493,12 +493,14 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
}
if (!libhal_ctx_init(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't initialise context: %s (%s)\n",
- error.name, error.message);
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
goto out_ctx;
}
if (!libhal_device_property_watch_all(info->hal_ctx, &error)) {
LogMessage(X_ERROR, "config/hal: couldn't watch all properties: %s (%s)\n",
- error.name, error.message);
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
goto out_ctx2;
}
libhal_ctx_set_device_added(info->hal_ctx, device_added);
@@ -518,7 +520,8 @@ connect_and_register(DBusConnection *connection, struct config_hal_info *info)
out_ctx2:
if (!libhal_ctx_shutdown(info->hal_ctx, &error))
LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n",
- error.name, error.message);
+ error.name ? error.name : "unknown error",
+ error.message ? error.message : "null");
out_ctx:
libhal_ctx_free(info->hal_ctx);
out_err: