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

Commit 4618e341 authored by Arun Sharma's avatar Arun Sharma Committed by Automerger Merge Worker
Browse files

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

Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f7 am: 828d85ae am: 932fe519 am: 4a2611cc am: 3da4ed00

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099



Change-Id: I90eb1a0507b80f04bae77c858617df1e40921006
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 39336e6b 3da4ed00

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;