Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78cfef9f authored by Roshan Pius's avatar Roshan Pius
Browse files

wifi(implementation): Add null checks for RTT result 

According to the legacy HAL header file, the LCI & LCR fields may not
always be populated. So, add null checks for them.

Bug: 36141536
Test: Compiles
Change-Id: Id2a5f5fd0eaf21b3a4d5cfcd26124c9fb6c90869
parent 4f4fdaf6

wifi/1.0/default/hidl_struct_util.cpp

+4 −2
Original line number Diff line number Diff line
@@ -1898,10 +1898,12 @@ bool convertLegacyRttResultToHidl( 
  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;