diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-09-04 19:43:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-09-04 19:43:03 +0000 |
| commit | d230bcf4b05d785b43bbcfa1e6c4aef6c6fb9530 (patch) | |
| tree | 0dfca6a01bd541ad062d5210153b386c4c6d34c5 /trusty | |
| parent | aa31cfcd5c8c7c8ba57e63f60c8047754f9bfd2c (diff) | |
| parent | 56c533dfd96983823f12f2d6240b114bee798135 (diff) | |
| download | system_core-d230bcf4b05d785b43bbcfa1e6c4aef6c6fb9530.tar.gz system_core-d230bcf4b05d785b43bbcfa1e6c4aef6c6fb9530.tar.bz2 system_core-d230bcf4b05d785b43bbcfa1e6c4aef6c6fb9530.zip | |
Merge "Fix disagreement of client_id/app_data pointer semantic"
Diffstat (limited to 'trusty')
| -rw-r--r-- | trusty/keymaster/legacy/trusty_keymaster_device.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/trusty/keymaster/legacy/trusty_keymaster_device.cpp b/trusty/keymaster/legacy/trusty_keymaster_device.cpp index ea00a92e0..afdf43bb0 100644 --- a/trusty/keymaster/legacy/trusty_keymaster_device.cpp +++ b/trusty/keymaster/legacy/trusty_keymaster_device.cpp @@ -122,10 +122,10 @@ template <typename RequestType> void AddClientAndAppData(const keymaster_blob_t* client_id, const keymaster_blob_t* app_data, RequestType* request) { request->additional_params.Clear(); - if (client_id) { + if (client_id && client_id->data_length > 0) { request->additional_params.push_back(TAG_APPLICATION_ID, *client_id); } - if (app_data) { + if (app_data && app_data->data_length > 0) { request->additional_params.push_back(TAG_APPLICATION_DATA, *app_data); } } |