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

Commit 608e33f7 authored by Arun Sharma's avatar Arun Sharma Committed by Gerrit Code Review
Browse files

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

parents 4b3b6e2f 1a3456f0

fastboot/device/fastboot_device.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -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;