From e779a4ea234801eb279f378b6999705f10cd5abc Mon Sep 17 00:00:00 2001
From: Gilad Arnold <garnold@google.com>
Date: Mon, 31 Aug 2015 12:26:13 -0700
Subject: Check whether DBus is initialized before attempting platform init.

Otherwise, we segfault.

Bug: 22373707
Change-Id: I94601696055e5f649334f470f4827f92614ff74a
---
 src/platform-cros.c | 5 +++++
 1 file changed, 5 insertions(+)

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;
-- 
cgit v1.2.3