| commit | 828d85ae89da53a1362a34d5e65e5334943efdb2 | [log] [tgz] |
|---|---|---|
| author | Arun Sharma <arsharma@google.com> | Thu Oct 05 17:45:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 05 17:45:17 2023 +0000 |
| tree | 0e6db3e3df92ddc743155ccc3b09ac68c042617e | |
| parent | 4cda9ec9bbd91f4f75b10115562f26196735b799 [diff] | |
| parent | 608e33f736db543a37ed9f99f937fe30098cb775 [diff] |
Merge "FastbootDevice::boot1_1 null pointer dereference" into main am: 608e33f736 Original change: https://android-review.googlesource.com/c/platform/system/core/+/2768099 Change-Id: Id99a4a6aceaedfdbc67311d6f7234c3334fc0209 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/fastboot/device/fastboot_device.cpp b/fastboot/device/fastboot_device.cpp index 6b6a982..0dc4e97 100644 --- a/fastboot/device/fastboot_device.cpp +++ b/fastboot/device/fastboot_device.cpp
@@ -151,7 +151,8 @@ } 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;