ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "FastbootDevice::boot1_1 null pointer dereference" into main

Browse source
This commit is contained in:
Arun Sharma 2023-10-05 17:33:34 +00:00 • committed by Gerrit Code Review
commit 608e33f736
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fastboot/device/fastboot_device.cpp
View file

@ -151,7 +151,8 @@ std::string FastbootDevice::GetCurrentSlot() {
} }
BootControlClient* FastbootDevice::boot1_1() const { BootControlClient* FastbootDevice::boot1_1() const {
if (boot_control_hal_->GetVersion() >= android::hal::BootControlVersion::BOOTCTL_V1_1) { if (boot_control_hal_ &&
boot_control_hal_->GetVersion() >= android::hal::BootControlVersion::BOOTCTL_V1_1) {
return boot_control_hal_.get(); return boot_control_hal_.get();
} }
return nullptr; return nullptr;