Merge "FastbootDevice::boot1_1 null pointer dereference" into main
This commit is contained in:
commit
608e33f736
1 changed files with 2 additions and 1 deletions
|
|
@ -151,7 +151,8 @@ std::string FastbootDevice::GetCurrentSlot() {
|
|||
}
|
||||
|
||||
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 nullptr;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue