empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Prevent possible crash while reading contacts cursor.

Browse source
This commit is contained in:
Greyson Parrelli 2022-03-30 16:17:15 -04:00
parent 42ccd638bd
commit 0278882c30
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contacts/lib/src/main/java/org/signal/contacts/SystemContactsRepository.kt
View file

@ -579,11 +579,11 @@ object SystemContactsRepository {
}
override fun hasNext(): Boolean {
return !cursor.isAfterLast
return !cursor.isAfterLast && cursor.position >= 0
}
override fun next(): ContactDetails {
if (cursor.isAfterLast) {
if (cursor.isAfterLast || cursor.position < 0) {
throw NoSuchElementException()
}
@ -591,7 +591,7 @@ object SystemContactsRepository {
val phoneDetails: List<ContactPhoneDetails> = readAllPhones(cursor, lookupKey)
val structuredName: StructuredName? = readStructuredName(cursor, lookupKey)
while (!cursor.isAfterLast && cursor.getLookupKey() == lookupKey) {
while (!cursor.isAfterLast && cursor.position >= 0 && cursor.getLookupKey() == lookupKey) {
cursor.moveToNext()
}