Skip to content
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

Make sure we don't trash our userinfo after we get it and before we send it. #26373

Merged
merged 1 commit into from
May 8, 2023
Merged

Make sure we don't trash our userinfo after we get it and before we send it. #26373

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
21 changes: 14 additions & 7 deletions src/app/clusters/door-lock-server/door-lock-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,20 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
return;
}

Commands::GetUserResponse::Type response;

// appclusters, 5.2.4.36.1: We need to add next occupied user after userIndex if any.
//
// We want to do this before we call emberAfPluginDoorLockGetUser, because this will
// make its own emberAfPluginDoorLockGetUser calls, and a
// EmberAfPluginDoorLockUserInfo might be pointing into some application-static
// buffers (for its credentials and whatnot).
uint16_t nextAvailableUserIndex = 0;
if (findOccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
{
response.nextUserIndex.SetNonNull(nextAvailableUserIndex);
}

EmberAfPluginDoorLockUserInfo user;
if (!emberAfPluginDoorLockGetUser(commandPath.mEndpointId, userIndex, user))
{
Expand All @@ -461,7 +475,6 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
return;
}

Commands::GetUserResponse::Type response;
response.userIndex = userIndex;

// appclusters, 5.2.4.36: we should not set user-specific fields to non-null if the user status is set to Available
Expand Down Expand Up @@ -498,12 +511,6 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
emberAfDoorLockClusterPrintln("[GetUser] User not found [userIndex=%d]", userIndex);
}

// appclusters, 5.2.4.36.1: We need to add next occupied user after userIndex if any.
uint16_t nextAvailableUserIndex = 0;
if (findOccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
{
response.nextUserIndex.SetNonNull(nextAvailableUserIndex);
}
commandObj->AddResponse(commandPath, response);
}

Expand Down