mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix potential stack overflow when getting identity record.

fork-5.53.8
Greyson Parrelli 2021-09-21 09:16:58 -04:00
rodzic 93fd6e7a55
commit e2dbaa605b
1 zmienionych plików z 3 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/database/IdentityDatabase.java
Wyświetl plik

@ -38,6 +38,7 @@ import org.thoughtcrime.securesms.util.SqlUtil;
import org.whispersystems.libsignal.IdentityKey; import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.InvalidKeyException; import org.whispersystems.libsignal.InvalidKeyException;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
import org.whispersystems.signalservice.api.util.UuidUtil;
import java.io.IOException; import java.io.IOException;
@ -108,11 +109,11 @@ public class IdentityDatabase extends Database {
firstUse, firstUse,
timestamp, timestamp,
nonblockingApproval); nonblockingApproval);
} else if (!fastIsE164(addressName)) { } else if (UuidUtil.isUuid(addressName)) {
if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(addressName)) { if (DatabaseFactory.getRecipientDatabase(context).containsPhoneOrUuid(addressName)) {
Recipient recipient = Recipient.external(context, addressName); Recipient recipient = Recipient.external(context, addressName);
if (recipient.hasE164()) { if (recipient.hasE164() && !UuidUtil.isUuid(recipient.requireE164())) {
Log.i(TAG, "Could not find identity for UUID. Attempting E164."); Log.i(TAG, "Could not find identity for UUID. Attempting E164.");
return getIdentityStoreRecord(recipient.requireE164()); return getIdentityStoreRecord(recipient.requireE164());
} else { } else {
@ -269,8 +270,4 @@ public class IdentityDatabase extends Database {
EventBus.getDefault().post(new IdentityRecord(recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval)); EventBus.getDefault().post(new IdentityRecord(recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval));
} }
private boolean fastIsE164(@NonNull String value) {
return value.charAt(0) == '+' || value.length() <= 15;
}
} }