commit ff4a17aafbf47bb38c4cc1c31e0761a008176252
author Steven Moreland <smoreland@google.com> Fri Nov 01 15:38:04 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Nov 01 15:38:04 2019 -0700
tree e8d1947334144449074ccb3735e6d3fc28dea4b1
parent ce8bdbdc3b95549fc2fd395a0318b327e23fb67a
parent 0ffc43e86a1c7dd950b7d3987083ee45b2c25061

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

Change-Id: Ic980783663e47228e1a82eaf390efa2e13e00306

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;
         }
     }