From 9afe88283d069f99350af8ab87205318bf664005 Mon Sep 17 00:00:00 2001
From: Frederick Mayle <fmayle@google.com>
Date: Wed, 23 Mar 2022 17:00:27 +0000
Subject: keystore: Fix double ownership of ConfirmationListener

Using std::make_shared with ndk::SharedRefBase objects causes memory
errors.

Ignore-AOSP-First: Waiting for security team feedback first.
Bug: 226234140, 226379467
Test: TH
Change-Id: I3fa639e92024ec418c69b4e355ac425884c22026
---
 keystore/keystore_cli_v2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'keystore')

diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index 1e9126d0..d01c67d4 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -1025,7 +1025,7 @@ int Confirmation(const std::string& promptText, const std::string& extraDataHex,
         return 1;
     }
 
-    auto listener = std::make_shared<ConfirmationListener>();
+    auto listener = ndk::SharedRefBase::make<ConfirmationListener>();
 
     auto future = listener->get_future();
     auto rc = apcService->presentPrompt(listener, promptText, extraData, locale, uiOptionsAsFlags);
-- 
cgit v1.2.3