| commit | bfc8afb4b11431ab370129c971d16a6e3f1794bc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 07 07:32:06 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 07:32:06 2022 +0000 |
| tree | a3afd8e8ade9305c715960203383aa0f14b40bbe | |
| parent | cdf14d4f4f720544d2da988fecfd9d9782b55513 [diff] | |
| parent | 270df536e2a386715740cdef39de18d5a1c523b8 [diff] |
Merge "Verify op_ is not a nullptr" am: 2d63764c34 am: a8b92e548f am: 3284c9aec4 am: 270df536e2 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1940573 Change-Id: I1f9528c2abc699b27d77b3be1ffbb6897c9f11c8
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);