commit e4d836a41fd9285c9f9707a56ef07eefb537c962
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 01 22:16:39 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 01 22:16:39 2019 +0000
tree 15b79f399fd41fbeb6bac70e4b11517825ba999f
parent e13f284c643b156b4be541dfdbf9dca876d7618a
parent 97d1d4522d7b6f82651f4136340d7de1ca1e91be

Merge "servicemanager: avoid segfault on null manifest."

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