openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix disagreement of client_id/app_data pointer semantic"

This commit is contained in:
Treehugger Robot 2018-09-04 19:43:03 +00:00 committed by Gerrit Code Review
parent aa31cfcd5c 56c533dfd9
commit d230bcf4b0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trusty/keymaster/legacy/trusty_keymaster_device.cpp
View File

@ -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);
}
}