Skip to content

Add nullptr checks in ContentAppPlatform mContentAppFactory #41827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −0
Open

Add nullptr checks in ContentAppPlatform mContentAppFactory #41827

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/app/app-platform/ContentAppPlatform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,7 @@ void ContentAppPlatform::SetupAppPlatform()

ContentApp * ContentAppPlatform::GetContentAppInternal(const CatalogVendorApp & vendorApp)
{
VerifyOrReturnValue(mContentAppFactory != nullptr, nullptr);
if (vendorApp.catalogVendorId != mContentAppFactory->GetPlatformCatalogVendorId())
{
return nullptr;
Expand Down Expand Up @@ -325,6 +326,7 @@ ContentApp * ContentAppPlatform::LoadContentAppInternal(const CatalogVendorApp &
ContentApp * ContentAppPlatform::LoadContentAppByClient(uint16_t vendorId, uint16_t productId)
{
ChipLogProgress(DeviceLayer, "LoadContentAppByVendorId() - vendorId %d, productId %d", vendorId, productId);
VerifyOrReturnValue(mContentAppFactory != nullptr, nullptr);

CatalogVendorApp vendorApp;
CHIP_ERROR err = mContentAppFactory->LookupCatalogVendorApp(vendorId, productId, &vendorApp);
Expand All @@ -339,6 +341,7 @@ ContentApp * ContentAppPlatform::LoadContentAppByClient(uint16_t vendorId, uint1

ContentApp * ContentAppPlatform::LoadContentApp(const CatalogVendorApp & vendorApp)
{
VerifyOrReturnValue(mContentAppFactory != nullptr, nullptr);
if (vendorApp.catalogVendorId == mContentAppFactory->GetPlatformCatalogVendorId())
{
return LoadContentAppInternal(vendorApp);
Expand All @@ -356,6 +359,7 @@ ContentApp * ContentAppPlatform::LoadContentApp(const CatalogVendorApp & vendorA

ContentApp * ContentAppPlatform::GetContentApp(const CatalogVendorApp & vendorApp)
{
VerifyOrReturnValue(mContentAppFactory != nullptr, nullptr);
if (vendorApp.catalogVendorId == mContentAppFactory->GetPlatformCatalogVendorId())
{
return GetContentAppInternal(vendorApp);
Expand Down Expand Up @@ -671,6 +675,7 @@ CHIP_ERROR ContentAppPlatform::ManageClientAccess(Messaging::ExchangeManager & e
{
VerifyOrReturnError(successCb != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
VerifyOrReturnError(failureCb != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
VerifyOrReturnError(mContentAppFactory != nullptr, CHIP_ERROR_INCORRECT_STATE);

Access::Privilege vendorPrivilege = mContentAppFactory->GetVendorPrivilege(targetVendorId);

Expand Down
Loading