commit e71b00bc336080cb98a55d1635119b5be51961ae
author Madhav Iyengar <madhaviyengar@google.com> Tue Jul 02 01:29:36 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 02 01:29:36 2024 +0000
tree e3088d00bc85b4bf1323e737de000ab712448ea6
parent 6271ac09fa8a038384b1a5c22c843d08f1dd49af
parent 04b9c2c69d5491236d7ea6b9cc2df925ce79bbda

Merge "Fixes possible race in example Sensors HAL" into main

security/keymint/support/remote_prov_utils.cpp

diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp
index b74fd59..3ac0dee 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -824,7 +824,7 @@
         }
         if (i == chain.size() - 1) {
             auto key = getRawPublicKey(pubKey);
-            if (!key) key.moveMessage();
+            if (!key) return key.moveMessage();
             rawPubKey = key.moveValue();
         }
     }