| commit | 465c154df0cb417bb6dc81e8e7a766273857bdf0 | [log] [tgz] |
|---|---|---|
| author | Shawn Willden <swillden@google.com> | Wed May 03 22:03:17 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 03 22:03:17 2017 +0000 |
| tree | e99dc526386603f5a3b5dbf6110d711d6bcfd36f | |
| parent | 11397b8339306f5f8429739f5f5b05c59840becb [diff] | |
| parent | 839ef0db4058c4d8dd37ece22069fcb181453a7e [diff] |
Merge "Fix Keymaster HAL crash." into oc-dev am: a22bc7450b am: 839ef0db40 Change-Id: Iff8c31d686680a33674a4f5a480c3bf90c8bd4be
diff --git a/keymaster/3.0/default/KeymasterDevice.cpp b/keymaster/3.0/default/KeymasterDevice.cpp index 219f419..fcdd329 100644 --- a/keymaster/3.0/default/KeymasterDevice.cpp +++ b/keymaster/3.0/default/KeymasterDevice.cpp
@@ -549,6 +549,7 @@ if (!foundAttestationApplicationId) { _hidl_cb(ErrorCode::ATTESTATION_APPLICATION_ID_MISSING, resultCertChain); + return Void(); } keymaster_cert_chain_t cert_chain{nullptr, 0};