Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-26 12:44:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible stack overflow in backup export.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-02-03 12:26:38 -05:00
parent bd61044643
commit 699b788187
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/backup/FullBackupExporter.java
View File

@@ -580,9 +580,9 @@ public class FullBackupExporter extends FullBackupBase {
}
private static boolean isNonExpiringMessage(@NonNull SQLiteDatabase db, @NonNull Cursor cursor) {
long id = CursorUtil.requireLong(cursor, MessageTable.ID);
long expireStarted = CursorUtil.requireLong(cursor, MessageTable.EXPIRE_STARTED);
long expiresIn = CursorUtil.requireLong(cursor, MessageTable.EXPIRES_IN);
long originalMessageId = CursorUtil.requireLong(cursor, MessageTable.ORIGINAL_MESSAGE_ID);
long latestRevisionId = CursorUtil.requireLong(cursor, MessageTable.LATEST_REVISION_ID);
long expiresAt = expireStarted + expiresIn;
@@ -592,11 +592,7 @@ public class FullBackupExporter extends FullBackupBase {
return false;
}
if (originalMessageId > 0 && !isForNonExpiringMessage(db, originalMessageId)) {
return false;
}
if (latestRevisionId > 0 && !isForNonExpiringMessage(db, latestRevisionId)) {
if (latestRevisionId > 0 && latestRevisionId != id && !isForNonExpiringMessage(db, latestRevisionId)) {
return false;
}
@@ -604,7 +600,7 @@ public class FullBackupExporter extends FullBackupBase {
}
private static boolean isForNonExpiringMessage(@NonNull SQLiteDatabase db, long messageId) {
String[] columns = new String[] { MessageTable.EXPIRE_STARTED, MessageTable.EXPIRES_IN, MessageTable.LATEST_REVISION_ID, MessageTable.ORIGINAL_MESSAGE_ID };
String[] columns = new String[] { MessageTable.ID, MessageTable.EXPIRE_STARTED, MessageTable.EXPIRES_IN, MessageTable.LATEST_REVISION_ID };
String where = MessageTable.ID + " = ?";
String[] args = SqlUtil.buildArgs(messageId);