Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97d1d452 authored by Steven Moreland's avatar Steven Moreland
Browse files

servicemanager: avoid segfault on null manifest. 

A device like this should fail VTS or other tests, but a segfault is
counterproductive.

Bug: 143744480
Test: TH
Change-Id: I71c42f1f8d5288152c6db43c33f44a7235df1265
parent 93711c8b

cmds/servicemanager/ServiceManager.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,7 @@ static bool isVintfDeclared(const std::string& name) { 
            vintf::VintfObject::GetDeviceHalManifest(),

            vintf::VintfObject::GetDeviceHalManifest(),

            vintf::VintfObject::GetFrameworkHalManifest()

            vintf::VintfObject::GetFrameworkHalManifest()

        }) {

        }) {

        if (manifest->hasAidlInstance(package, iface, instance)) {

        if (manifest != nullptr && manifest->hasAidlInstance(package, iface, instance)) {

            return true;

            return true;

        }

        }

    }

    }