Fix NPE in Options.retainAll when map option entry omits value#3536
Open
jhansche wants to merge 1 commit intosquare:masterfrom
Open
Fix NPE in Options.retainAll when map option entry omits value#3536jhansche wants to merge 1 commit intosquare:masterfrom
jhansche wants to merge 1 commit intosquare:masterfrom
Conversation
Map option entries may omit 'value' when the value type's default is
desired. This is common in OpenAPI v2 annotations, e.g. a security
requirement that needs bearer auth but no scopes:
security: { security_requirement: { key: "bearer" } }
Wire's canonicalizeValue correctly produces null for the missing value,
but gatherFields and retainAll assumed non-null values everywhere,
crashing with NPE during schema pruning. Fix by accepting nullable
values: make retainAll's parameter Any?, add an o == null -> null branch,
and remove unnecessary !! operators on map/list iteration variables.
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Author
|
Sorry I missed it earlier: CLA has been signed. |
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.
Map option entries may omit 'value' when the value type's default is desired. This is common in OpenAPI v2 annotations, e.g. a security requirement that needs bearer auth but no scopes:
security: { security_requirement: { key: "bearer" } }Wire's canonicalizeValue correctly produces null for the missing value, but gatherFields and retainAll assumed non-null values everywhere, crashing with NPE during schema pruning. Fix by accepting nullable values: make retainAll's parameter Any?, add an o == null -> null branch, and remove unnecessary !! operators on map/list iteration variables.
Co-Authored-By: Claude Opus 4.6 noreply@anthropic.com