commit 1a429dc9d8b00a9ca4c2c6abdd60dd6da4ce2368
author Roshan Pius <rpius@google.com> Sat Mar 11 07:05:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 11 07:05:30 2017 +0000
tree 6942e4729f28a6190dc2e02a6dcf7c6934ff1d5b
parent a20c517278cfb50f51e707f98061e1f38638ada5
parent 53c158606b8ce60d36fef7f9e9cab4af16b17dce

wifi(implementation): Add null checks for RTT result am: 78cfef9f0c am: 841ba1b367
am: 53c158606b

Change-Id: Ia36f323770af2f72bf416f686ac6e521adcf5ff4

wifi/1.0/default/hidl_struct_util.cpp

diff --git a/wifi/1.0/default/hidl_struct_util.cpp b/wifi/1.0/default/hidl_struct_util.cpp
index 98a62bf..a89f8c0 100644
--- a/wifi/1.0/default/hidl_struct_util.cpp
+++ b/wifi/1.0/default/hidl_struct_util.cpp
@@ -1898,10 +1898,12 @@
   hidl_result->timeStampInUs = legacy_result.ts;
   hidl_result->burstDurationInMs = legacy_result.burst_duration;
   hidl_result->negotiatedBurstNum = legacy_result.negotiated_burst_num;
-  if (!convertLegacyIeToHidl(*legacy_result.LCI, &hidl_result->lci)) {
+  if (legacy_result.LCI && !convertLegacyIeToHidl(*legacy_result.LCI,
+                                                  &hidl_result->lci)) {
     return false;
   }
-  if (!convertLegacyIeToHidl(*legacy_result.LCR, &hidl_result->lcr)) {
+  if (legacy_result.LCR && !convertLegacyIeToHidl(*legacy_result.LCR,
+                                                  &hidl_result->lcr)) {
     return false;
   }
   return true;