commit b051e1dba2f1aacb1d9af3d54516c14e7b40b4cc
author Jason Macnak <natsu@google.com> Fri Nov 01 12:51:15 2019 -0700
committer Jason Macnak <natsu@google.com> Mon Nov 04 09:19:47 2019 -0800
tree 4618276062a300358be412263aa5bffcbe094c26
parent 6d1e770c2a9912b1dcd75225c6ed46da76fd3897

Update rild to handle init failure

RIL_Init can return null when it fails to connect to the config
server which eventually leads to crash later on.

Bug: b/143876883
Test: m dist && launch_cvd
Change-Id: I4e32f172d7d549968c9a19ac3dde9cc32f040e17

guest/hals/rild/rild_cuttlefish.c

diff --git a/guest/hals/rild/rild_cuttlefish.c b/guest/hals/rild/rild_cuttlefish.c
index c2efe44..cfd74fa 100644
--- a/guest/hals/rild/rild_cuttlefish.c
+++ b/guest/hals/rild/rild_cuttlefish.c
@@ -207,6 +207,11 @@
     rilArgv[0] = argv[0];
 
     funcs = rilInit(&s_rilEnv, argc, rilArgv);
+    if (funcs == NULL) {
+        RLOGE("RIL_Init rilInit failed.\n");
+        exit(EXIT_FAILURE);
+    }
+
     RLOGD("RIL_Init rilInit completed");
 
     RLOGD("RIL_Init callback versions = %d", funcs->version);