commit 275bc4e0629812b2bef939c78475c64a58939d90
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Nov 04 23:02:07 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 04 23:02:07 2024 +0000
tree 821a295fbbfd628a403e82ac991897d74e047f8a
parent 4756cccee021c62c7a8eb4e2c9306423c2c9fd82
parent 11104185f255cd3ab95da6b56ba92931829a91fd

Merge "Check for null callback pointers in the Vendor HAL AIDL callback util." into main

wifi/aidl/default/aidl_callback_util.h

diff --git a/wifi/aidl/default/aidl_callback_util.h b/wifi/aidl/default/aidl_callback_util.h
index f8ba53b..2419db9 100644
--- a/wifi/aidl/default/aidl_callback_util.h
+++ b/wifi/aidl/default/aidl_callback_util.h
@@ -45,6 +45,11 @@
     ~AidlCallbackHandler() { invalidate(); }
 
     bool addCallback(const std::shared_ptr<CallbackType>& cb) {
+        if (cb == nullptr) {
+            LOG(ERROR) << "Unable to register a null callback";
+            return false;
+        }
+
         std::unique_lock<std::mutex> lk(callback_handler_lock_);
         void* cbPtr = reinterpret_cast<void*>(cb->asBinder().get());
         const auto& cbPosition = findCbInSet(cbPtr);