commit 0ffc43e86a1c7dd950b7d3987083ee45b2c25061
author Steven Moreland <smoreland@google.com> Fri Nov 01 15:29:59 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 15:29:59 2019 -0700
tree 418457d38f71273fad7c074041087427695c98bc
parent fec67a6c6470c1872200fd804d9e1ca91ad00d6f
parent 6a52945988296baaeb7c8a16d622d7aad87c8543

Merge "servicemanager: avoid segfault on null manifest." am: e4d836a41f
am: 6a52945988

Change-Id: I934adcabb1d4f8b2c81b0507f7977e360c7c183c

cmds/servicemanager/ServiceManager.cpp

diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
index 91e89ae..861401c 100644
--- a/cmds/servicemanager/ServiceManager.cpp
+++ b/cmds/servicemanager/ServiceManager.cpp
@@ -50,7 +50,7 @@
             vintf::VintfObject::GetDeviceHalManifest(),
             vintf::VintfObject::GetFrameworkHalManifest()
         }) {
-        if (manifest->hasAidlInstance(package, iface, instance)) {
+        if (manifest != nullptr && manifest->hasAidlInstance(package, iface, instance)) {
             return true;
         }
     }