summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2009-05-08 21:31:01 -0700
committerKeith Packard <keithp@keithp.com>2009-07-29 15:49:23 -0700
commit546f913ff5461dd93d4a0b29b24d2267557326c7 (patch)
tree5acfaf780e9c59b14c92bd9a3984bd92c7e7dab8
parent155cb2f9a376d40b699a72ac3bdede71af1b518f (diff)
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> (cherry picked from commit 1e816065e5ec3b9394dc1fa5815457a664e15fd9)
-rw-r--r--config/hal.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/config/hal.c b/config/hal.c
index 36fa839fb..731d9b8fc 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: