Merge cherrypicks of [7705823] into pi-qpr3-releaseandroid-9.0.0_r46android-9.0.0_r44pie-qpr3-release

Change-Id: Ibf43a7586ae09992bdb019e971279fc8286c8561

1 files changed, 4 insertions, 4 deletions

diff --git a/hals/keymaster/KeymasterDevice.cpp b/hals/keymaster/KeymasterDevice.cpp
index cb3d6ff..61614e9 100644
--- a/hals/keymaster/KeymasterDevice.cpp
+++ b/hals/keymaster/KeymasterDevice.cpp
@@ -807,13 +807,13 @@ Return<void> KeymasterDevice::attestKey(
     }
 
     vector<hidl_vec<uint8_t> > chain;
+    string attestation_str = ss.str();
     {
         hidl_vec<uint8_t> attestation_certificate;
         attestation_certificate.setToExternal(
-            reinterpret_cast<uint8_t*>(
-                const_cast<char*>(ss.str().data())),
-            ss.str().size(), false);
-
+                reinterpret_cast<uint8_t*>(
+                        const_cast<char*>(attestation_str.data())),
+                attestation_str.size(), false);
 
         chain.push_back(std::move(attestation_certificate));