commit 2165de0046c76ad9e4ba91d9c90e74c69b31c50a
author Tommy Chiu <tommychiu@google.com> Mon Jul 01 06:29:40 2024 +0000
committer Tommy Chiu <tommychiu@google.com> Mon Jul 01 06:43:30 2024 +0000
tree 8448e58cb61a609d3deba1cf56c460b471fdbbbb
parent bb35effe0dad5c22833cf98ea9861cfc3316e17f

Fix invalid access on nullptr

Should return when there's no content be parsed.

Bug: 330791928
Test: rkp_factory_extraction_tool64
Change-Id: I45302ec20a0a931d2f44a7e36f613858c10fe21e

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 a830041..5ab1514 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();
         }
     }