commit d230bcf4b05d785b43bbcfa1e6c4aef6c6fb9530
author Treehugger Robot <treehugger-gerrit@google.com> Tue Sep 04 19:43:03 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 04 19:43:03 2018 +0000
tree 0dfca6a01bd541ad062d5210153b386c4c6d34c5
parent aa31cfcd5c8c7c8ba57e63f60c8047754f9bfd2c
parent 56c533dfd96983823f12f2d6240b114bee798135

Merge "Fix disagreement of client_id/app_data pointer semantic"

trusty/keymaster/legacy/trusty_keymaster_device.cpp

diff --git a/trusty/keymaster/legacy/trusty_keymaster_device.cpp b/trusty/keymaster/legacy/trusty_keymaster_device.cpp
index ea00a92..afdf43b 100644
--- a/trusty/keymaster/legacy/trusty_keymaster_device.cpp
+++ b/trusty/keymaster/legacy/trusty_keymaster_device.cpp
@@ -122,10 +122,10 @@
 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);
     }
 }