Fix v2 backup crash when group master key is invalid - #14972
Open
loucass wants to merge 3 commits into
Open
Conversation
mtang-signal
left a comment
mtang-signal
left a comment
Contributor
There was a problem hiding this comment.
I don't mind the change in principle but is the pr description correct on what it was resolving (a NPE in attachments)?
Author
|
@mtang-signal You're right, my bad I made both fixes but forgot to push the main fix... however I have kept the group guard as a defensive fix but just pushed the missing DATA_RANDOM filter and updated the description |
loucass
force-pushed
the
fix/android-backup-v2-invalid-group-masterkey
branch
from
September 1, 2026 13:54
cd9ca2a to
8db83a0
Compare
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
2 participants
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.
Fixes #14875
Old phones have attachments where DATA_RANDOM is null (classic encryption). The backup query only checked hash/file/key, so those rows slipped through and crashed on requireNonNullBlob. Added DATA_RANDOM IS NOT NULL filter in both places.
Also kept the group master key null check from the first commit - same kind of issue, just defensive.