commit 2d63764c34b23a445e2cbde9f74b3f81715defb6
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 07 06:35:30 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 07 06:35:30 2022 +0000
tree 251ab97d6b46e06a1c74365d24718c5a5cba2f80
parent 782706bd0902abc298d878d99d5edbdffdfed703
parent eabd9d6d2ac5b50dc06eb0c9ac2c3d8715eec030

Merge "Verify op_ is not a nullptr"

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
index 3695f1e..02462fc 100644
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -537,6 +537,9 @@
     Status result;
     if (!output) return ErrorCode::UNEXPECTED_NULL_POINTER;
 
+    EXPECT_NE(op_, nullptr);
+    if (!op_) return ErrorCode::UNEXPECTED_NULL_POINTER;
+
     std::vector<uint8_t> o_put;
     result = op_->update(vector<uint8_t>(input.begin(), input.end()), {}, {}, &o_put);