Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Usb: Add status check to prevent NPE

Browse source 
This patch prevents a Null Pointer Exception in
queryMoistureDetectionStatus() when getPortStatusHelper() fails to open
the /sys/class/typec file. The failure results in an empty
currentPortStatus vector, causing the NPE when accessing its first
element.

Bug: 361097811
Flag: EXEMPT bugfix
Test: NPE does not occur when getPortStatusHelper() fails
Change-Id: I61c9f7647aafca28b777e53f170764ddd02c060f
Signed-off-by: Kuen-Han Tsai <khtsai@google.com>
This commit is contained in:
Kuen-Han Tsai 2024-10-09 15:15:56 +08:00
parent 617251a80a
commit f22f21191b
1 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

24
usb/usb/Usb.cpp
View file

@ -990,17 +990,21 @@ void queryVersionHelper(android::hardware::usb::Usb *usb,
Status status; Status status;
pthread_mutex_lock(&usb->mLock); pthread_mutex_lock(&usb->mLock);
status = getPortStatusHelper(usb, currentPortStatus); status = getPortStatusHelper(usb, currentPortStatus);
queryMoistureDetectionStatus(usb, currentPortStatus); if (status == Status::SUCCESS && currentPortStatus->size() > 0) {
queryPowerTransferStatus(usb, currentPortStatus); queryMoistureDetectionStatus(usb, currentPortStatus);
queryNonCompliantChargerStatus(currentPortStatus); queryPowerTransferStatus(usb, currentPortStatus);
queryUsbDataSession(usb, currentPortStatus); queryNonCompliantChargerStatus(currentPortStatus);
if (usb->mCallback != NULL) { queryUsbDataSession(usb, currentPortStatus);
ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus, if (usb->mCallback != NULL) {
status); ScopedAStatus ret = usb->mCallback->notifyPortStatusChange(*currentPortStatus,
if (!ret.isOk()) status);
ALOGE("queryPortStatus error %s", ret.getDescription().c_str()); if (!ret.isOk())
ALOGE("queryPortStatus error %s", ret.getDescription().c_str());
} else {
ALOGI("Notifying userspace skipped. Callback is NULL");
}
} else { } else {
ALOGI("Notifying userspace skipped. Callback is NULL"); ALOGI("%s skipped. currentPortStatus is empty", __func__);
} }
pthread_mutex_unlock(&usb->mLock); pthread_mutex_unlock(&usb->mLock);
} }