Fix invalid optional access in GetHostBuild#2241
Merged
Databean merged 1 commit intogoogle:mainfrom Mar 10, 2026
Merged
Conversation
3405691582
approved these changes
Mar 10, 2026
The expression `host_package_build.value_or(*fallback_host_build);` to
select between two optionals after knowing one is set is invalid. In the
case where `fallback_host_build` is missing and `host_package_build` is
present, `fallback_host_build` is still dereferenced to supply the
argument to `value_or`, even if it is ignored by the implementation.
Issue observed by dsk@ using the following configuration to `cvd load`:
```
{
"common": {
"host_package": "@ab/aosp-android-latest-release/aosp_cf_x86_64_only_phone-userdebug"
},
"instances": [
{
"disk": {
"default_build": "14981173"
},
"name": "ins-1",
"vm": {
"cpus": 4,
"memory_mb": 4096
}
}
],
"metrics": {
"enable": true
}
}
```
Bug: b/491203837
Databean
force-pushed
the
cvd_load_optional
branch
from
84ec51e to
53a3b4d
Compare
Member
Author
|
Thanks for reviewing! |
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
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
3 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.
The expression
host_package_build.value_or(*fallback_host_build);to select between two optionals after knowing one is set is invalid. In the case wherefallback_host_buildis missing andhost_package_buildis present,fallback_host_buildis still dereferenced to supply the argument tovalue_or, even if it is ignored by the implementation.Issue observed by dsk@ using the following configuration to
cvd load:Bug: b/491203837