commit 841ba1b36763d03a98d68718eee192024f366f79
author Roshan Pius <rpius@google.com> Sat Mar 11 06:56:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Mar 11 06:56:59 2017 +0000
tree 1be6507fd057a09a02a2e18c0a9a04ff97f2d806
parent a8239094f4b000f19cc493b163990bc81e12a226
parent 78cfef9f0c03a1b11c987ef165133bc3ae2d8b9c

wifi(implementation): Add null checks for RTT result
am: 78cfef9f0c

Change-Id: I9a58ca156d3e2f61fda8346d39b8de355302690f

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;