Skip to content

Guard to avoid Service.getDeviceID()' on a null object reference (#1142) and cleanServicesAndCharacteristicsForDevice outOfBounds (#1144) crashes #1282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
angelos3lex wants to merge 1 commit into from
+18 −12
Closed

Guard to avoid Service.getDeviceID()' on a null object reference (#1142) and cleanServicesAndCharacteristicsForDevice outOfBounds (#1144) crashes #1282

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions android/src/main/java/com/bleplx/adapter/BleModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1563,27 +1563,33 @@ private Characteristic getCharacteristicOrEmitError(final int characteristicIden

private void cleanServicesAndCharacteristicsForDevice(@NonNull Device device) {
for (int i = discoveredServices.size() - 1; i >= 0; i--) {
int key = discoveredServices.keyAt(i);
Service service = discoveredServices.get(key);
if (i < discoveredServices.size()) { // guards concurrent changes in discoveredServices while iterating to avoid #1144
int key = discoveredServices.keyAt(i);
Service service = discoveredServices.get(key);

if (service.getDeviceID().equals(device.getId())) {
discoveredServices.remove(key);
if (service == null || service.getDeviceID().equals(device.getId())) {
discoveredServices.remove(key);
}
}
}
for (int i = discoveredCharacteristics.size() - 1; i >= 0; i--) {
int key = discoveredCharacteristics.keyAt(i);
Characteristic characteristic = discoveredCharacteristics.get(key);
if (i < discoveredCharacteristics.size()) {
int key = discoveredCharacteristics.keyAt(i);
Characteristic characteristic = discoveredCharacteristics.get(key);

if (characteristic.getDeviceId().equals(device.getId())) {
discoveredCharacteristics.remove(key);
if (characteristic == null || characteristic.getDeviceId().equals(device.getId())) {
discoveredCharacteristics.remove(key);
}
}
}

for (int i = discoveredDescriptors.size() - 1; i >= 0; i--) {
int key = discoveredDescriptors.keyAt(i);
Descriptor descriptor = discoveredDescriptors.get(key);
if (descriptor.getDeviceId().equals(device.getId())) {
discoveredDescriptors.remove(key);
if (i < discoveredDescriptors.size()) {
int key = discoveredDescriptors.keyAt(i);
Descriptor descriptor = discoveredDescriptors.get(key);
if (descriptor == null || descriptor.getDeviceId().equals(device.getId())) {
discoveredDescriptors.remove(key);
}
}
}
}
Expand Down