Merge "servicemanager: avoid segfault on null manifest." am: e4d836a am: 6a52945

Steven Moreland · android-build-merger · commit ff4a17aafbf4 · 2019-11-01T15:38:04.000-07:00
am: 0ffc43e Change-Id: Ic980783663e47228e1a82eaf390efa2e13e00306
diff --git a/cmds/servicemanager/ServiceManager.cpp b/cmds/servicemanager/ServiceManager.cpp
@@ -50,7 +50,7 @@ static bool isVintfDeclared(const std::string& name) {
             vintf::VintfObject::GetDeviceHalManifest(),
             vintf::VintfObject::GetFrameworkHalManifest()
         }) {
-        if (manifest->hasAidlInstance(package, iface, instance)) {
+        if (manifest != nullptr && manifest->hasAidlInstance(package, iface, instance)) {
             return true;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ static bool isVintfDeclared(const std::string& name) {`
`50`	`50`	`vintf::VintfObject::GetDeviceHalManifest(),`
`51`	`51`	`vintf::VintfObject::GetFrameworkHalManifest()`
`52`	`52`	`}) {`
`53`		`- if (manifest->hasAidlInstance(package, iface, instance)) {`
	`53`	`+ if (manifest != nullptr && manifest->hasAidlInstance(package, iface, instance)) {`
`54`	`54`	`return true;`
`55`	`55`	`}`
`56`	`56`	`}`