| commit | daccd40364baa1ccfa8f1df1a9bcff1ed769b2a6 | [log] [tgz] |
|---|---|---|
| author | Pawan Wagh <waghpawan@google.com> | Thu Feb 09 03:42:31 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Feb 09 03:42:31 2023 +0000 |
| tree | 3a3bf89e94754dc060c71b1e4471e16b65c48e49 | |
| parent | f862766f37d7d707068a6d1e41001f91ed51a0b7 [diff] | |
| parent | 9b1300716414d770496452a5ff14c85f15f58cfc [diff] |
Fixing null deference in android.hardware.usb.gadget-service.example am: 9b13007164 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2412576 Change-Id: I5c5ade46872035607fe95943b50e746de680aaec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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,