Skip to content

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

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

Merged
aliberski merged 3 commits into from
May 26, 2025
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3958c5c
guard to avoid Service.getDeviceID()' on a null object reference (#11…
angelos3lex Mar 20, 2025
9503fb7
remove ".remove" from cleanServicesAndCharacteristicsForDevice for loops
angelos3lex Mar 28, 2025
2551cfc
make it compliant for api 30 and below
angelos3lex Apr 3, 2025
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
33 changes: 25 additions & 8 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 @@ -1562,27 +1562,44 @@ private Characteristic getCharacteristicOrEmitError(final int characteristicIden
}

private void cleanServicesAndCharacteristicsForDevice(@NonNull Device device) {
for (int i = discoveredServices.size() - 1; i >= 0; i--) {
List<Integer> discoveredServicesKeysToRemove = new ArrayList<>();
for (int i = 0; i < discoveredServices.size(); i++) {
int key = discoveredServices.keyAt(i);
Service service = discoveredServices.get(key);

if (service.getDeviceID().equals(device.getId())) {
if (service == null || service.getDeviceID().equals(device.getId())) {
discoveredServicesKeysToRemove.add(key);
}
}
for (int key : discoveredServicesKeysToRemove) {
if (discoveredServices.indexOfKey(key) >= 0) {
discoveredServices.remove(key);
}
}
for (int i = discoveredCharacteristics.size() - 1; i >= 0; i--) {

List<Integer> discoveredCharacteristicsKeysToRemove = new ArrayList<>();
for (int i = 0; i < discoveredCharacteristics.size(); i++) {
int key = discoveredCharacteristics.keyAt(i);
Characteristic characteristic = discoveredCharacteristics.get(key);

if (characteristic.getDeviceId().equals(device.getId())) {
if (characteristic == null || characteristic.getDeviceId().equals(device.getId())) {
discoveredCharacteristicsKeysToRemove.add(key);
}
}
for (int key : discoveredCharacteristicsKeysToRemove) {
if (discoveredCharacteristics.indexOfKey(key) >= 0) {
discoveredCharacteristics.remove(key);
}
}

for (int i = discoveredDescriptors.size() - 1; i >= 0; i--) {
List<Integer> discoveredDescriptorsKeysToRemove = new ArrayList<>();
for (int i = 0; i < discoveredDescriptors.size(); i++) {
int key = discoveredDescriptors.keyAt(i);
Descriptor descriptor = discoveredDescriptors.get(key);
if (descriptor.getDeviceId().equals(device.getId())) {
if (descriptor == null || descriptor.getDeviceId().equals(device.getId())) {
discoveredDescriptorsKeysToRemove.add(key);
}
}
for (int key : discoveredDescriptorsKeysToRemove) {
if (discoveredDescriptors.indexOfKey(key) >= 0) {
discoveredDescriptors.remove(key);
}
}
Expand Down