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

Fix potential NPE when reading old attachments.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-09-20 21:30:01 -04:00
parent 90998a4076
commit 5b69d98579
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/database/AttachmentTable.kt
View File

@@ -1626,13 +1626,7 @@ class AttachmentTable(
.from(TABLE_NAME)
.where("$ID = ?", attachmentId.id)
.run()
.readToSingleObject { cursor ->
if (cursor.isNull(DATA_FILE) || cursor.isNull(DATA_RANDOM)) {
null
} else {
cursor.readDataFileInfo()
}
}
.readToSingleObject { cursor -> cursor.readDataFileInfo() }
}
fun getThumbnailFileInfo(attachmentId: AttachmentId): ThumbnailFileInfo? {
@@ -2289,6 +2283,7 @@ class AttachmentTable(
.where("$DATA_FILE NOT NULL AND ($DATA_HASH_START = ? OR $DATA_HASH_END = ?)", fileWriteResult.hash, fileWriteResult.hash)
.run()
.readToList { it.readDataFileInfo() }
.filterNotNull()
.sortedByDescending { it.uploadTimestamp }
.firstOrNull { existingMatch ->
areTransformationsCompatible(
@@ -2493,12 +2488,15 @@ class AttachmentTable(
return getAttachment(this)
}
private fun Cursor.readDataFileInfo(): DataFileInfo {
private fun Cursor.readDataFileInfo(): DataFileInfo? {
val filePath: String = this.requireString(DATA_FILE) ?: return null
val random: ByteArray = this.requireBlob(DATA_RANDOM) ?: return null
return DataFileInfo(
id = AttachmentId(this.requireLong(ID)),
file = File(this.requireNonNullString(DATA_FILE)),
file = File(filePath),
length = this.requireLong(DATA_SIZE),
random = this.requireNonNullBlob(DATA_RANDOM),
random = random,
hashStart = this.requireString(DATA_HASH_START),
hashEnd = this.requireString(DATA_HASH_END),
transformProperties = TransformProperties.parse(this.requireString(TRANSFORM_PROPERTIES)),