Skip to content

Commit 141c555

Browse files
committed
Review comments and nuttx build failure fix attempt
1 parent 31a7ddd commit 141c555

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

examples/platform/linux/BUILD.gn

+4-1
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,17 @@ source_set("app-main") {
9898
"${chip_root}/src/controller:gen_check_chip_controller_headers",
9999
"${chip_root}/src/lib",
100100
"${chip_root}/src/platform/logging:default",
101-
jsoncpp_root,
102101
]
103102
deps = [
104103
":ota-test-event-trigger",
105104
"${chip_root}/examples/providers:device_info_provider",
106105
"${chip_root}/src/app/server",
107106
]
108107

108+
if (current_os != "nuttx") {
109+
public_deps += [ jsoncpp_root ]
110+
}
111+
109112
if (chip_enable_pw_rpc) {
110113
defines += [ "PW_RPC_ENABLED" ]
111114
}

src/access/AccessRestrictionProvider.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ CHIP_ERROR AccessRestrictionProvider::SetEntries(const FabricIndex fabricIndex,
122122
bool AccessRestrictionProvider::StandardAccessRestrictionExceptionChecker::AreRestrictionsAllowed(EndpointId endpoint,
123123
ClusterId cluster)
124124
{
125-
if (endpoint != 0 &&
125+
if (endpoint != kRootEndpointId &&
126126
(cluster == app::Clusters::WiFiNetworkManagement::Id || cluster == app::Clusters::ThreadBorderRouterManagement::Id ||
127127
cluster == app::Clusters::ThreadNetworkDirectory::Id))
128128
{

src/app/clusters/access-control-server/access-control-server.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,13 @@ bool emberAfAccessControlClusterReviewFabricRestrictionsCallback(
645645
entry.restrictions.push_back(restriction);
646646
}
647647

648+
if (restrictionIter.GetStatus() != CHIP_NO_ERROR)
649+
{
650+
ChipLogError(DataManagement, "AccessControlCluster: invalid ARL data");
651+
commandObj->AddStatus(commandPath, Protocols::InteractionModel::Status::InvalidValue);
652+
return true;
653+
}
654+
648655
entries.push_back(entry);
649656
}
650657

0 commit comments

Comments
 (0)