commit ec383afca0de8783609c470ece17bbae59ebb0ed
author Hardik Goyal <hardikgoyal@google.com> Mon Jul 19 12:12:14 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Mon Jul 19 19:42:17 2021 +0000
tree 5a4849a143fff334571e514db37abb008bb0a293
parent a99bb48cf00496d7eed6b587c6440b2f6edf07b0

cryptohome: Fix conditional statement in VaultKeyset

BUG=b:194095357
TEST=For Test team to verify

Change-Id: I15700a80b84317bf8222d6f34afb98f16b528b78
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform2/+/3039560
Reviewed-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Tested-by: Jorge Lucangeli Obes <jorgelo@chromium.org>
Commit-Queue: Hardik Goyal <hardikgoyal@chromium.org>

cryptohome/vault_keyset.cc

diff --git a/cryptohome/vault_keyset.cc b/cryptohome/vault_keyset.cc
index d6362d5..c428555 100644
--- a/cryptohome/vault_keyset.cc
+++ b/cryptohome/vault_keyset.cc
@@ -468,7 +468,7 @@
 }
 
 std::string VaultKeyset::GetLabel() const {
-  if (key_data_.has_value() & !key_data_->label().empty()) {
+  if (key_data_.has_value() && !key_data_->label().empty()) {
     return key_data_->label();
   }
   // Fallback for legacy keys, for which the label has to be inferred from the