Skip to content

Commit 1356518

Browse files
tcarmelveilleuxpull[bot]
tcarmelveilleux
authored and
pull[bot]
committed
Make all public FabricInfo getters const (#20088)
* Make all public FabricInfo getters const - Only FabricTable APIs are allowed to mutate FabricInfo entries due to the requirements of fail-safe shadow data handling - Previous PRs made sure none of the mutators were used outside of FabricTable, but `FindFabricByIndex` remained a non-const getter due to how much code was using it. Fixes #19929 This PR: - Renames the mutable `FabricInfo *` getter as `GetMutableFabricByIndex()` and makes it private to FabricTable. - Adds `const` qualifier to every other usage of FindFabricByIndex in the SDK. Testing done: - All unit tests pass - Cert tests still pass - Still compiles * Fix CI on Shell * Fix one const in ESP32 ShellCommands.h
1 parent b637740 commit 1356518

File tree

18 files changed

+70
-73
lines changed

18 files changed

+70
-73
lines changed

‎examples/all-clusters-app/esp32/main/include/ShellCommands.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ class CASECommands
125125
// Register the CASESession commands
126126
void Register();
127127

128-
void SetFabricInfo(FabricInfo * fabricInfo) { mFabricInfo = fabricInfo; }
128+
void SetFabricInfo(const FabricInfo * fabricInfo) { mFabricInfo = fabricInfo; }
129129
void SetNodeId(NodeId nodeId) { mNodeId = nodeId; }
130130
void SetOnConnecting(bool onConnecting) { mOnConnecting = onConnecting; }
131-
FabricInfo * GetFabricInfo(void) { return mFabricInfo; }
131+
const FabricInfo * GetFabricInfo(void) { return mFabricInfo; }
132132
NodeId GetNodeId(void) { return mNodeId; }
133133
bool GetOnConnecting(void) { return mOnConnecting; }
134134

@@ -167,7 +167,7 @@ class CASECommands
167167
return CHIP_ERROR_INCORRECT_STATE;
168168
}
169169
const FabricIndex fabricIndex = static_cast<FabricIndex>(strtoul(argv[0], nullptr, 10));
170-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
170+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
171171

172172
if (fabricInfo == nullptr)
173173
{
@@ -201,9 +201,9 @@ class CASECommands
201201
static Callback::Callback<OnDeviceConnected> sOnConnectedCallback;
202202
static Callback::Callback<OnDeviceConnectionFailure> sOnConnectionFailureCallback;
203203
static Shell::Engine sSubShell;
204-
FabricInfo * mFabricInfo = nullptr;
205-
NodeId mNodeId = 0;
206-
bool mOnConnecting = false;
204+
const FabricInfo * mFabricInfo = nullptr;
205+
NodeId mNodeId = 0;
206+
bool mOnConnecting = false;
207207
};
208208

209209
} // namespace Shell

‎examples/all-clusters-minimal-app/esp32/main/include/ShellCommands.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ class CASECommands
125125
// Register the CASESession commands
126126
void Register();
127127

128-
void SetFabricInfo(FabricInfo * fabricInfo) { mFabricInfo = fabricInfo; }
128+
void SetFabricInfo(const FabricInfo * fabricInfo) { mFabricInfo = fabricInfo; }
129129
void SetNodeId(NodeId nodeId) { mNodeId = nodeId; }
130130
void SetOnConnecting(bool onConnecting) { mOnConnecting = onConnecting; }
131-
FabricInfo * GetFabricInfo(void) { return mFabricInfo; }
131+
const FabricInfo * GetFabricInfo(void) { return mFabricInfo; }
132132
NodeId GetNodeId(void) { return mNodeId; }
133133
bool GetOnConnecting(void) { return mOnConnecting; }
134134

@@ -167,7 +167,7 @@ class CASECommands
167167
return CHIP_ERROR_INCORRECT_STATE;
168168
}
169169
const FabricIndex fabricIndex = static_cast<FabricIndex>(strtoul(argv[0], nullptr, 10));
170-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
170+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
171171

172172
if (fabricInfo == nullptr)
173173
{
@@ -201,9 +201,9 @@ class CASECommands
201201
static Callback::Callback<OnDeviceConnected> sOnConnectedCallback;
202202
static Callback::Callback<OnDeviceConnectionFailure> sOnConnectionFailureCallback;
203203
static Shell::Engine sSubShell;
204-
FabricInfo * mFabricInfo = nullptr;
205-
NodeId mNodeId = 0;
206-
bool mOnConnecting = false;
204+
const FabricInfo * mFabricInfo = nullptr;
205+
NodeId mNodeId = 0;
206+
bool mOnConnecting = false;
207207
};
208208

209209
} // namespace Shell

‎examples/ota-provider-app/ota-provider-common/OTAProviderExample.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ void OTAProviderExample::SendQueryImageResponse(app::CommandHandler * commandObj
247247

248248
// TODO: This uses the current node as the provider to supply the OTA image. This can be configurable such that the
249249
// provider supplying the response is not the provider supplying the OTA image.
250-
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
251-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
252-
NodeId nodeId = fabricInfo->GetPeerId().GetNodeId();
250+
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
251+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
252+
NodeId nodeId = fabricInfo->GetPeerId().GetNodeId();
253253

254254
// Generate the ImageURI if one is not already preset
255255
if (strlen(mImageUri) == 0)

‎examples/tv-casting-app/tv-casting-common/commands/clusters/ModelCommand.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ CHIP_ERROR ModelCommand::RunCommand()
4848
}
4949

5050
Server * server = &(chip::Server::GetInstance());
51-
chip::FabricInfo * fabric = server->GetFabricTable().FindFabricWithIndex(fabricIndex);
51+
const FabricInfo * fabric = server->GetFabricTable().FindFabricWithIndex(fabricIndex);
5252
if (fabric == nullptr)
5353
{
5454
ChipLogError(AppServer, "Did not find fabric for index %d", fabricIndex);

‎examples/tv-casting-app/tv-casting-common/src/TargetVideoPlayerInfo.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ CHIP_ERROR TargetVideoPlayerInfo::Initialize(NodeId nodeId, FabricIndex fabricIn
3333
}
3434

3535
Server * server = &(chip::Server::GetInstance());
36-
chip::FabricInfo * fabric = server->GetFabricTable().FindFabricWithIndex(fabricIndex);
36+
const FabricInfo * fabric = server->GetFabricTable().FindFabricWithIndex(fabricIndex);
3737
if (fabric == nullptr)
3838
{
3939
ChipLogError(AppServer, "Did not find fabric for index %d", fabricIndex);

‎src/app/clusters/administrator-commissioning-server/administrator-commissioning-server.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,10 @@ bool emberAfAdministratorCommissioningClusterOpenCommissioningWindowCallback(
105105

106106
ChipLogProgress(Zcl, "Received command to open commissioning window");
107107

108-
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
109-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
110-
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
111-
auto & commissionMgr = Server::GetInstance().GetCommissioningWindowManager();
108+
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
109+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
110+
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
111+
auto & commissionMgr = Server::GetInstance().GetCommissioningWindowManager();
112112

113113
VerifyOrExit(fabricInfo != nullptr, status.Emplace(StatusCode::EMBER_ZCL_STATUS_CODE_PAKE_PARAMETER_ERROR));
114114
VerifyOrExit(!failSafeContext.IsFailSafeArmed(), status.Emplace(StatusCode::EMBER_ZCL_STATUS_CODE_BUSY));
@@ -167,10 +167,10 @@ bool emberAfAdministratorCommissioningClusterOpenBasicCommissioningWindowCallbac
167167
InteractionModel::Status globalStatus = InteractionModel::Status::Success;
168168
ChipLogProgress(Zcl, "Received command to open basic commissioning window");
169169

170-
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
171-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
172-
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
173-
auto & commissionMgr = Server::GetInstance().GetCommissioningWindowManager();
170+
FabricIndex fabricIndex = commandObj->GetAccessingFabricIndex();
171+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
172+
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
173+
auto & commissionMgr = Server::GetInstance().GetCommissioningWindowManager();
174174

175175
VerifyOrExit(fabricInfo != nullptr, status.Emplace(StatusCode::EMBER_ZCL_STATUS_CODE_PAKE_PARAMETER_ERROR));
176176

‎src/app/clusters/bindings/BindingManager.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace {
5252

5353
chip::PeerId PeerIdForNode(chip::FabricTable * fabricTable, chip::FabricIndex fabric, chip::NodeId node)
5454
{
55-
chip::FabricInfo * fabricInfo = fabricTable->FindFabricWithIndex(fabric);
55+
const chip::FabricInfo * fabricInfo = fabricTable->FindFabricWithIndex(fabric);
5656
if (fabricInfo == nullptr)
5757
{
5858
return chip::PeerId();
@@ -202,7 +202,7 @@ CHIP_ERROR BindingManager::NotifyBoundClusterChanged(EndpointId endpoint, Cluste
202202
{
203203
if (iter->type == EMBER_UNICAST_BINDING)
204204
{
205-
FabricInfo * fabricInfo = mInitParams.mFabricTable->FindFabricWithIndex(iter->fabricIndex);
205+
const FabricInfo * fabricInfo = mInitParams.mFabricTable->FindFabricWithIndex(iter->fabricIndex);
206206
VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_NOT_FOUND);
207207
PeerId peer = fabricInfo->GetPeerIdForNode(iter->nodeId);
208208
OperationalDeviceProxy * peerDevice = mInitParams.mCASESessionManager->FindExistingSession(peer);

‎src/app/clusters/operational-credentials-server/operational-credentials-server.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ CHIP_ERROR OperationalCredentialsAttrAccess::Read(const ConcreteReadAttributePat
244244
return CHIP_NO_ERROR;
245245
}
246246

247-
FabricInfo * RetrieveCurrentFabric(CommandHandler * aCommandHandler)
247+
const FabricInfo * RetrieveCurrentFabric(CommandHandler * aCommandHandler)
248248
{
249249
FabricIndex index = aCommandHandler->GetAccessingFabricIndex();
250250
ChipLogDetail(Zcl, "OpCreds: Finding fabric with fabricIndex 0x%x", static_cast<unsigned>(index));
@@ -282,7 +282,7 @@ void FailSafeCleanup(const chip::DeviceLayer::ChipDeviceEvent * event)
282282
CASESessionManager * caseSessionManager = Server::GetInstance().GetCASESessionManager();
283283
if (caseSessionManager)
284284
{
285-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
285+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(fabricIndex);
286286
VerifyOrReturn(fabricInfo != nullptr);
287287

288288
caseSessionManager->ReleaseSessionsForFabric(fabricInfo->GetFabricIndex());
@@ -489,7 +489,7 @@ bool emberAfOperationalCredentialsClusterUpdateFabricLabelCallback(app::CommandH
489489
CHIP_ERROR err = CHIP_ERROR_INTERNAL;
490490

491491
// Fetch current fabric
492-
FabricInfo * fabric = RetrieveCurrentFabric(commandObj);
492+
const FabricInfo * fabric = RetrieveCurrentFabric(commandObj);
493493
if (fabric == nullptr)
494494
{
495495
SendNOCResponse(commandObj, commandPath, OperationalCertStatus::kInsufficientPrivilege, ourFabricIndex,
@@ -607,8 +607,8 @@ bool emberAfOperationalCredentialsClusterAddNOCCallback(app::CommandHandler * co
607607
CHIP_ERROR err = CHIP_NO_ERROR;
608608
FabricIndex newFabricIndex = kUndefinedFabricIndex;
609609
Credentials::GroupDataProvider::KeySet keyset;
610-
FabricInfo * newFabricInfo = nullptr;
611-
auto & fabricTable = Server::GetInstance().GetFabricTable();
610+
const FabricInfo * newFabricInfo = nullptr;
611+
auto & fabricTable = Server::GetInstance().GetFabricTable();
612612

613613
auto * secureSession = commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession();
614614
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
@@ -781,9 +781,9 @@ bool emberAfOperationalCredentialsClusterUpdateNOCCallback(app::CommandHandler *
781781

782782
ChipLogProgress(Zcl, "OpCreds: Received an UpdateNOC command");
783783

784-
auto & fabricTable = Server::GetInstance().GetFabricTable();
785-
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
786-
FabricInfo * fabricInfo = RetrieveCurrentFabric(commandObj);
784+
auto & fabricTable = Server::GetInstance().GetFabricTable();
785+
auto & failSafeContext = Server::GetInstance().GetFailSafeContext();
786+
const FabricInfo * fabricInfo = RetrieveCurrentFabric(commandObj);
787787

788788
bool csrWasForUpdateNoc = false; //< Output param of HasPendingOperationalKey
789789
bool hasPendingKey = fabricTable.HasPendingOperationalKey(csrWasForUpdateNoc);
@@ -1011,7 +1011,7 @@ bool emberAfOperationalCredentialsClusterCSRRequestCallback(app::CommandHandler
10111011
commandObj->GetExchangeContext()->GetSessionHandle()->AsSecureSession()->GetCryptoContext().GetAttestationChallenge();
10121012

10131013
failSafeContext.SetCsrRequestForUpdateNoc(isForUpdateNoc);
1014-
FabricInfo * fabricInfo = RetrieveCurrentFabric(commandObj);
1014+
const FabricInfo * fabricInfo = RetrieveCurrentFabric(commandObj);
10151015

10161016
VerifyOrExit(CSRNonce.size() == Credentials::kExpectedAttestationNonceSize, finalStatus = Status::InvalidCommand);
10171017

‎src/app/clusters/ota-requestor/DefaultOTARequestor.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ void DefaultOTARequestor::ConnectToProvider(OnConnectedAction onConnectedAction)
363363
return;
364364
}
365365

366-
FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
366+
const FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
367367

368368
if (fabricInfo == nullptr)
369369
{
@@ -393,7 +393,7 @@ void DefaultOTARequestor::DisconnectFromProvider()
393393
return;
394394
}
395395

396-
FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
396+
const FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
397397
if (fabricInfo == nullptr)
398398
{
399399
ChipLogError(SoftwareUpdate, "Cannot find fabric");
@@ -726,7 +726,7 @@ CHIP_ERROR DefaultOTARequestor::GenerateUpdateToken()
726726
VerifyOrReturnError(mServer != nullptr, CHIP_ERROR_INCORRECT_STATE);
727727
VerifyOrReturnError(mProviderLocation.HasValue(), CHIP_ERROR_INCORRECT_STATE);
728728

729-
FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
729+
const FabricInfo * fabricInfo = mServer->GetFabricTable().FindFabricWithIndex(mProviderLocation.Value().fabricIndex);
730730
VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_INCORRECT_STATE);
731731

732732
static_assert(sizeof(NodeId) == sizeof(uint64_t), "Unexpected NodeId size");

‎src/app/clusters/ota-requestor/ExtendedOTARequestorDriver.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ CHIP_ERROR ExtendedOTARequestorDriver::GetUserConsentSubject(chip::ota::UserCons
7777
return CHIP_ERROR_INTERNAL;
7878
}
7979

80-
FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(subject.fabricIndex);
80+
const FabricInfo * fabricInfo = Server::GetInstance().GetFabricTable().FindFabricWithIndex(subject.fabricIndex);
8181
if (fabricInfo == nullptr)
8282
{
8383
ChipLogError(SoftwareUpdate, "Cannot find fabric");

‎src/app/server/Server.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ class Server
370370

371371
void OnGroupAdded(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & new_group) override
372372
{
373-
FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
373+
const FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
374374
if (fabric == nullptr)
375375
{
376376
ChipLogError(AppServer, "Group added to nonexistent fabric?");
@@ -386,7 +386,7 @@ class Server
386386

387387
void OnGroupRemoved(chip::FabricIndex fabric_index, const Credentials::GroupDataProvider::GroupInfo & old_group) override
388388
{
389-
FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
389+
const FabricInfo * fabric = mServer->GetFabricTable().FindFabricWithIndex(fabric_index);
390390
if (fabric == nullptr)
391391
{
392392
ChipLogError(AppServer, "Group added to nonexistent fabric?");

‎src/app/tests/TestOperationalDeviceProxy.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ void TestOperationalDeviceProxy_EstablishSessionDirectly(nlTestSuite * inSuite,
5151
System::LayerImpl systemLayer;
5252
// Heap-allocate the fairly large FabricTable so we don't end up with a huge
5353
// stack.
54-
FabricTable * fabrics = Platform::New<FabricTable>();
55-
FabricInfo * fabric = fabrics->FindFabricWithIndex(1);
54+
FabricTable * fabrics = Platform::New<FabricTable>();
55+
const FabricInfo * fabric = fabrics->FindFabricWithIndex(1);
5656
VerifyOrDie(fabric != nullptr);
5757
secure_channel::MessageCounterManager messageCounterManager;
5858
chip::TestPersistentStorageDelegate deviceStorage;

‎src/credentials/FabricTable.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ const FabricInfo * FabricTable::FindFabric(const Crypto::P256PublicKey & rootPub
467467
return nullptr;
468468
}
469469

470-
FabricInfo * FabricTable::FindFabricWithIndex(FabricIndex fabricIndex)
470+
FabricInfo * FabricTable::GetMutableFabricByIndex(FabricIndex fabricIndex)
471471
{
472472
// Try to match pending fabric first if available
473473
if (HasPendingFabricUpdate() && (mPendingFabric.GetFabricIndex() == fabricIndex))
@@ -870,13 +870,13 @@ CHIP_ERROR FabricTable::Delete(FabricIndex fabricIndex)
870870
VerifyOrReturnError(mStorage != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
871871
VerifyOrReturnError(IsValidFabricIndex(fabricIndex), CHIP_ERROR_INVALID_ARGUMENT);
872872

873-
FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
873+
FabricInfo * fabricInfo = GetMutableFabricByIndex(fabricIndex);
874874
if (fabricInfo == &mPendingFabric)
875875
{
876876
// Asked to Delete while pending an update: reset the pending state and
877877
// get back to the underlying fabric data for existing fabric.
878878
RevertPendingFabricData();
879-
fabricInfo = FindFabricWithIndex(fabricIndex);
879+
fabricInfo = GetMutableFabricByIndex(fabricIndex);
880880
}
881881

882882
bool fabricIsInitialized = fabricInfo != nullptr && fabricInfo->IsInitialized();
@@ -1053,7 +1053,7 @@ void FabricTable::Forget(FabricIndex fabricIndex)
10531053
{
10541054
ChipLogProgress(FabricProvisioning, "Forgetting fabric 0x%x", static_cast<unsigned>(fabricIndex));
10551055

1056-
auto * fabricInfo = FindFabricWithIndex(fabricIndex);
1056+
auto * fabricInfo = GetMutableFabricByIndex(fabricIndex);
10571057
VerifyOrReturn(fabricInfo != nullptr);
10581058

10591059
RevertPendingFabricData();
@@ -1741,7 +1741,7 @@ CHIP_ERROR FabricTable::CommitPendingFabricData()
17411741
}
17421742

17431743
// Make sure we actually have a pending fabric
1744-
FabricInfo * pendingFabricEntry = FindFabricWithIndex(fabricIndexBeingCommitted);
1744+
FabricInfo * pendingFabricEntry = GetMutableFabricByIndex(fabricIndexBeingCommitted);
17451745

17461746
if (isUpdating && hasPending && !hasInvalidInternalState)
17471747
{
@@ -1828,7 +1828,7 @@ CHIP_ERROR FabricTable::CommitPendingFabricData()
18281828
if (isUpdating)
18291829
{
18301830
// This will get the non-pending fabric
1831-
FabricInfo * existingFabricToUpdate = FindFabricWithIndex(fabricIndexBeingCommitted);
1831+
FabricInfo * existingFabricToUpdate = GetMutableFabricByIndex(fabricIndexBeingCommitted);
18321832

18331833
// Multiple interlocks validated the below, so it's fatal if we are somehow incoherent here
18341834
VerifyOrDie((existingFabricToUpdate != nullptr) && (existingFabricToUpdate != &mPendingFabric));
@@ -1839,7 +1839,7 @@ CHIP_ERROR FabricTable::CommitPendingFabricData()
18391839
}
18401840

18411841
// Store pending metadata first
1842-
FabricInfo * liveFabricEntry = FindFabricWithIndex(fabricIndexBeingCommitted);
1842+
FabricInfo * liveFabricEntry = GetMutableFabricByIndex(fabricIndexBeingCommitted);
18431843
VerifyOrDie(liveFabricEntry != nullptr);
18441844

18451845
CHIP_ERROR metadataErr = StoreFabricMetadata(liveFabricEntry);
@@ -2000,7 +2000,7 @@ CHIP_ERROR FabricTable::SetFabricLabel(FabricIndex fabricIndex, const CharSpan &
20002000

20012001
ReturnErrorCodeIf(fabricLabel.size() > kFabricLabelMaxLengthInBytes, CHIP_ERROR_INVALID_ARGUMENT);
20022002

2003-
FabricInfo * fabricInfo = FindFabricWithIndex(fabricIndex);
2003+
FabricInfo * fabricInfo = GetMutableFabricByIndex(fabricIndex);
20042004
bool fabricIsInitialized = (fabricInfo != nullptr) && fabricInfo->IsInitialized();
20052005
VerifyOrReturnError(fabricIsInitialized, CHIP_ERROR_INCORRECT_STATE);
20062006

0 commit comments

Comments
 (0)