commit 6fb5cb3332ac20decbe3049ff091532141e7f270
author Pawan Wagh <waghpawan@google.com> Wed Feb 01 23:38:37 2023 +0000
committer Pawan Wagh <waghpawan@google.com> Wed Feb 08 23:41:06 2023 +0000
tree 2ca5365750c7cbe808080edf5e285257fc8bf2f3
parent 654e766039fa6a957ba55281e2174c7c064329ad

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

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

usb/gadget/aidl/default/UsbGadget.cpp

diff --git a/usb/gadget/aidl/default/UsbGadget.cpp b/usb/gadget/aidl/default/UsbGadget.cpp
index c4986e8..4a40652 100644
--- a/usb/gadget/aidl/default/UsbGadget.cpp
+++ b/usb/gadget/aidl/default/UsbGadget.cpp
@@ -90,8 +90,11 @@
     gadget->mCurrentUsbFunctionsApplied = functionsApplied;
 }
 
-ScopedAStatus UsbGadget::getCurrentUsbFunctions(const shared_ptr<IUsbGadgetCallback> &callback,
-	int64_t in_transactionId) {
+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,