commit 9b1300716414d770496452a5ff14c85f15f58cfc
author Pawan Wagh <waghpawan@google.com> Wed Feb 01 23:38:37 2023 +0000
committer Pawan Wagh <waghpawan@google.com> Thu Feb 09 01:34:19 2023 +0000
tree e8f01b5d0a978f436e149b2944983c01e1b07e69
parent 915fde07bd0a6b93ffdee9653641743828723c96

Fixing null deference in android.hardware.usb.gadget-service.example

Test: atest VtsAidlUsbTargetTest
Bug: 267534245
Change-Id: Ib28b7848205809912b6789d0e050c1a981dc1ce8
Merged-In: Ib28b7848205809912b6789d0e050c1a981dc1ce8

usb/gadget/aidl/default/UsbGadget.cpp

diff --git a/usb/gadget/aidl/default/UsbGadget.cpp b/usb/gadget/aidl/default/UsbGadget.cpp
index 72cf681..51f7f5b 100644
--- a/usb/gadget/aidl/default/UsbGadget.cpp
+++ b/usb/gadget/aidl/default/UsbGadget.cpp
@@ -91,6 +91,9 @@
 
 ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback>& callback,
                                                 int64_t in_transactionId) {
+    if (callback == nullptr) {
+        return ScopedAStatus::fromExceptionCode(EX_NULL_POINTER);
+    }
     ScopedAStatus ret = callback->getCurrentUsbFunctionsCb(
             mCurrentUsbFunctions,
             mCurrentUsbFunctionsApplied ? Status::FUNCTIONS_APPLIED : Status::FUNCTIONS_NOT_APPLIED,