| commit | a22bc7450b8a114843a27c36c511910bf4472914 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed May 03 21:50:22 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 03 21:50:23 2017 +0000 |
| tree | 34f6a3d05c19c43b5ea0e1f5a0716a34f88b5296 | |
| parent | ed84acb9ff6233c43baabfbd8cb309688040f6c0 [diff] | |
| parent | fa67c8fc1d2c50ea9d4e04492d06f992ea65d2b6 [diff] |
Merge "Fix Keymaster HAL crash." into oc-dev
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};