fix: return InvalidData instead of panicking on crafted wallet bytes - #2751
Merged
zancas merged 1 commit intoAug 29, 2026
Merged
Conversation
LightWallet::validate promises an io::Result whose error names the byte offset reached, but the read path it wraps carried seven expect() calls that panic on crafted-but-reachable inputs: a pre-32 birthday above u32::MAX, account ids with the hardened bit set in the unified key store and in both address maps, a hardened transparent address index, a version 35 file whose key store vector holds no account 0, and a stored min_confirmations of zero. Each site now returns an InvalidData error instead, and the three identical account id reads collapse into one read_account_id helper. Five regression tests craft minimal wallet prefixes that reach the five shallow sites and assert validate returns an error rather than aborting. The birthday and min_confirmations sites sit behind fields whose grammars are impractical to hand-craft, so they are fixed by the same mechanical transformation without dedicated fixtures. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
zancas
merged commit Aug 29, 2026
d3989a2
into
bb/add-wallet-file-validation-thr_dfg7v7d7jv
20 checks passed
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
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 stacks on #2749 and repairs one review finding.
LightWallet::validatedocuments anio::Resultwhose error names the byte offset reached. The read path it wraps carried sevenexpect()calls that panic on crafted-but-reachable inputs. A validation entry point must not abort on the malformed files it exists to reject.The seven sites now return
InvalidDataerrors. They are: a pre-32 birthday aboveu32::MAX; account ids with the hardened bit set in the unified key store, the unified address map, and the transparent address map; a hardened transparent address index; a version 35 file whose key store vector holds no account 0; and a storedmin_confirmationsof zero. The three identical account id reads collapse into oneread_account_idhelper.Five regression tests craft minimal wallet prefixes that reach the five shallow sites. Each test asserts that
validatereturns an error instead of panicking. The birthday andmin_confirmationssites sit behind fields whose grammars are impractical to hand-craft. Those two sites receive the same mechanical repair without dedicated fixtures. Theexpect()at the account 0 lookup inread_v0stays, because the map is built one line above it and the lookup cannot fail.🤖 Generated with Claude Code