commit 608e33f736db543a37ed9f99f937fe30098cb775
author Arun Sharma <arsharma@google.com> Thu Oct 05 17:33:34 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 05 17:33:34 2023 +0000
tree 6df189c510d9d776f0ab0ad083a8a687f5207034
parent 4b3b6e2ff5710098aef06d829ae0056e4a712e13
parent 1a3456f0bce99cdbec087cfb0199c113ca722304

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

fastboot/device/fastboot_device.cpp

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;