commit af7df71799e6a0595e901ae5f3bd5891a20857cb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 01 21:29:05 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jul 01 21:29:05 2024 +0000
tree 492b6138e38963882f31dc1b8c01211d9975fb34
parent f28b8e809cd8ae3410c519aa8b84dd3480807916
parent 2165de0046c76ad9e4ba91d9c90e74c69b31c50a

Merge "Fix invalid access on nullptr" 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();
         }
     }