Merge "RAS: Prevent null pointer dereference while the service is not found" into main (ce886f7c) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/ras/ras_client.cc

+5 −0

Original line number	Diff line number	Diff line
		@@ -110,6 +110,10 @@ public:
		uint16_t conn_interval_ = kInvalidConnInterval;

		const gatt::Characteristic* FindCharacteristicByUuid(Uuid uuid) {
		if (service_ == nullptr) {
		log::error("Can't find Ranging Service");
		return nullptr;
		}
		for (auto& characteristic : service_->characteristics) {
		if (characteristic.uuid == uuid) {
		return &characteristic;
		@@ -117,6 +121,7 @@ public:
		}
		return nullptr;
		}

		const gatt::Characteristic* FindCharacteristicByHandle(uint16_t handle) {
		for (auto& characteristic : service_->characteristics) {
		if (characteristic.value_handle == handle) {