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

Commit 7cb84b93 authored by Chienyuan Huang's avatar Chienyuan Huang
Browse files

RAS: Fix null pointer dereference when remote device does not support real-time functionality 

Flag: com.android.bluetooth.flags.channel_sounding_in_stack
Bug: 324185011
Bug: 358120531
Test: m com.android.btservice
Change-Id: Ic4d14535ddf78ddbbd31cb400a1c557a587e4804
parent 472ac7e7

system/bta/ras/ras_client.cc

+11 −6
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ RasClientImpl* instance; 


enum CallbackDataType { VENDOR_SPECIFIC_REPLY };

static constexpr uint16_t kCachedDataSize = 10;

static constexpr uint16_t kInvalidGattHandle = 0x0000;



class RasClientImpl : public bluetooth::ras::RasClient {

public:
@@ -128,9 +129,12 @@ public: 
      trackers_.emplace_back(std::make_shared<RasTracker>(ble_bd_addr.bda, address));

    } else if (tracker->is_connected_) {

      log::info("Already connected");

      uint16_t att_handle = tracker->FindCharacteristicByUuid(kRasRealTimeRangingDataCharacteristic)

                                    ->value_handle;

      callbacks_->OnConnected(address, att_handle, tracker->vendor_specific_characteristics_);

      auto characteristic =

              tracker->FindCharacteristicByUuid(kRasRealTimeRangingDataCharacteristic);

      uint16_t real_time_att_handle =

              characteristic == nullptr ? kInvalidGattHandle : characteristic->value_handle;

      callbacks_->OnConnected(address, real_time_att_handle,

                              tracker->vendor_specific_characteristics_);

      return;

    }

    BTA_GATTC_Open(gatt_if_, ble_bd_addr.bda, BTM_BLE_DIRECT_CONNECTION, true);
@@ -636,9 +640,10 @@ public: 
      SubscribeCharacteristic(tracker, kRasRangingDataReadyCharacteristic);

      SubscribeCharacteristic(tracker, kRasRangingDataOverWrittenCharacteristic);

    }

    uint16_t att_handle =

            tracker->FindCharacteristicByUuid(kRasRealTimeRangingDataCharacteristic)->value_handle;

    callbacks_->OnConnected(tracker->address_for_cs_, att_handle,

    auto characteristic = tracker->FindCharacteristicByUuid(kRasRealTimeRangingDataCharacteristic);

    uint16_t real_time_att_handle =

            characteristic == nullptr ? kInvalidGattHandle : characteristic->value_handle;

    callbacks_->OnConnected(tracker->address_for_cs_, real_time_att_handle,

                            tracker->vendor_specific_characteristics_);

  }