diff options
| author | Gilad Arnold <garnold@google.com> | 2015-09-01 17:04:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 17:04:50 +0000 |
| commit | ed800d7483c0510631ad60f963738a645c818514 (patch) | |
| tree | c487959067722ceff4afed752fab7b84ebd4b568 | |
| parent | daecefc23b936e7655b4e0117f9bc994cba35882 (diff) | |
| parent | e779a4ea234801eb279f378b6999705f10cd5abc (diff) | |
| download | tlsdate-ed800d7483c0510631ad60f963738a645c818514.tar.gz | |
am e779a4ea: Check whether DBus is initialized before attempting platform init.
* commit 'e779a4ea234801eb279f378b6999705f10cd5abc':
Check whether DBus is initialized before attempting platform init.
| -rw-r--r-- | src/platform-cros.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/platform-cros.c b/src/platform-cros.c index c382c0d..9341750 100644 --- a/src/platform-cros.c +++ b/src/platform-cros.c @@ -533,6 +533,11 @@ platform_init_cros (struct state *state) /* Watch for per-service ProxyConfig property changes */ struct event_base *base = state->base; struct dbus_state *dbus_state = state->dbus; + if (!dbus_state) + { + info ("[cros] DBus not connected, skipping platform initialization."); + return 0; + } struct source *src = NULL; int sources = 0; DBusConnection *conn = dbus_state->conn; |