Fix NullPointerException in v2 backup creation for classic attachments#14882
Open
nathangiovannini99 wants to merge 1 commit into
Open
Fix NullPointerException in v2 backup creation for classic attachments#14882nathangiovannini99 wants to merge 1 commit into
nathangiovannini99 wants to merge 1 commit into
Conversation
- Updated LocalArchivableAttachment and DataFileInfo models to support nullable random bytes, allowing legacy "classic" attachments to be included in v2 backups. - Modified getDataStream and getThumbnailStream to fallback to ClassicDecryptingPartInputStream when random is null or invalid. - Fixed a performance bug in CursorExtensions.readToList and readToSet where the mapper was being invoked twice per row.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR fixes a NullPointerException that occurred when users with older accounts attempted to create v2 backups.
Root Cause: Older attachments encrypted using the "Classic" scheme have a NULL value in the DATA_RANDOM column of the attachment table. The current implementation of getLocalArchivableAttachments used requireNonNullBlob(DATA_RANDOM), which triggered a crash when encountering these legacy records.
Changes:
Model Nullability: Updated LocalArchivableAttachment, DataFileInfo, and ThumbnailFileInfo in AttachmentTable.kt to allow a nullable random field.
Decryption Fallback: Updated getDataStream and getThumbnailStream to check for the presence and length of the random bytes. If random is null or not 32 bytes, the logic now correctly falls back to ClassicDecryptingPartInputStream.
CursorExtensions Fix: While investigating, I found that readToList and readToSet in CursorExtensions.kt were invoking the mapper function twice per row (once for the predicate and once for the list addition). This has been fixed to only invoke the mapper once.
Fixes: #14875