Credential modification should check type, not just index. (#34841)
Credential indices are per-type, so we should be checking both when locating the
credential to be modified.
Fixes https://github.com/project-chip/connectedhomeip/issues/34816
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
index 68e5f39..e003f5b 100644
--- a/src/app/clusters/door-lock-server/door-lock-server.cpp
+++ b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -2340,8 +2340,9 @@
for (size_t i = 0; i < user.credentials.size(); ++i)
{
- // appclusters, 5.2.4.40: user should already be associated with given credentialIndex
- if (user.credentials.data()[i].credentialIndex == credential.credentialIndex)
+ // appclusters, 5.2.4.40: user should already be associated with given credential
+ if (user.credentials[i].credentialType == credential.credentialType &&
+ user.credentials[i].credentialIndex == credential.credentialIndex)
{
chip::Platform::ScopedMemoryBuffer<CredentialStruct> newCredentials;
if (!newCredentials.Alloc(user.credentials.size()))
@@ -2385,7 +2386,7 @@
}
}
- // appclusters, 5.2.4.40: if user is not associated with credential index we should return INVALID_COMMAND
+ // appclusters, 5.2.4.40: if user is not associated with the given credential we should return INVALID_COMMAND
ChipLogProgress(Zcl,
"[ModifyUserCredential] Unable to modify user credential: user is not associated with credential index "
"[endpointId=%d,userIndex=%d,credentialIndex=%d]",
