commit 2195d59fae0a2d50d63834ec51390aa52f9572f5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jul 01 21:51:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jul 01 21:51:02 2024 +0000
tree 472982b37542d95bd73c7779d284e8dc5d2a6264
parent 35b81e0b4704ffca932279e61c567917520233b1
parent af7df71799e6a0595e901ae5f3bd5891a20857cb

Merge "Fix invalid access on nullptr" into main am: af7df71799

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3153896

Change-Id: I8744406f970887c72b0932351ae3d88885cb0582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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();
         }
     }