| commit | 3284c9aec4becacb8d132f7a3a832fe813887a51 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Fri Jan 07 07:05:59 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jan 07 07:05:59 2022 +0000 |
| tree | 42e3fa5e5e8ed351bcd47cf512191ef4b7337afd | |
| parent | 2954763f9c331b7065316b82a51c26023e914a57 [diff] | |
| parent | a8b92e548f9713714a61507dbabfc83613a7b303 [diff] |
Merge "Verify op_ is not a nullptr" am: 2d63764c34 am: a8b92e548f Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1940573 Change-Id: I7a9c97c9e5a3f54f56b01153682667434a8d0125
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);