Fix crash when ignoring warning about missing preinit device #394
Conversation
This file contains 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
MagiskRootPatcher was previously assuming that there is a preinit device value if the Magisk version requires it. Signed-off-by: Andrew Gunnerson <[email protected]>
chenxiaolong
added a commit
that referenced
this pull request
Dec 11, 2024
Signed-off-by: Andrew Gunnerson <[email protected]>
pixincreate
reviewed
Dec 11, 2024
| @@ -510,7 +510,7 @@ impl BootImagePatch for MagiskRootPatcher { | |||
| magisk_config.push_str("SHA1=0000000000000000000000000000000000000000\n"); | |||
|
|
|||
| if Self::VER_RANDOM_SEED.contains(&self.version) { | |||
| magisk_config.push_str(&format!("RANDOMSEED={:#x}\n", self.random_seed)); | |||
| write!(&mut magisk_config, "RANDOMSEED={:#x}\n", self.random_seed).unwrap(); | |||
There was a problem hiding this comment.
Using unwrap() here would result in avbroot to panic if random_seed is null or undefined. Isn't it?
There was a problem hiding this comment.
In this case, the unwrap() is for the result of write!(), which cannot fail when appending to a string like magisk_config. (It can fail if writing to some other target, like a file.)
Regarding random_seed, there's no concept of null or undefined in Rust. It is always a valid integer.
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.
MagiskRootPatcherwas previously assuming that there is a preinit device value if the Magisk version requires it.