Switch Markup property to XmlNode?[]? to reflect it can contain null elements #41488
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
jozkee
requested review from
krwq,
jeffhandley,
carlossanlop,
eerhardt,
pgovind and
a team
jeffhandley
approved these changes
Aug 28, 2020
safern
reviewed
Aug 28, 2020
| if (a != null) | ||
| { | ||
| for (int ia = 0; ia < a.Length; ia++) | ||
| { | ||
| XmlNode ai = (XmlNode)a[ia]; | ||
| XmlNode ai = (XmlNode)a[ia]!; |
There was a problem hiding this comment.
How do we know this can't be null?
There was a problem hiding this comment.
I am not 100% sure but if ai happens to be null that would cause a NRE in line 552. So product code already assumes that ai can't be null.
| @@ -778,7 +778,7 @@ internal override bool IsContentParsed() | |||
| return _currentEntry.ParseContent; | |||
| } | |||
|
|
|||
| internal override void ProcessMarkup(XmlNode[] markup) | |||
| internal override void ProcessMarkup(XmlNode?[] markup) | |||
There was a problem hiding this comment.
markup is always initialized in the only call site.
runtime/src/libraries/System.Private.Xml/src/System/Xml/Schema/Parser.cs
Lines 246 to 252 in 454d66d
| @@ -561,7 +561,7 @@ internal override bool IsContentParsed() | |||
| return true; | |||
| } | |||
|
|
|||
| internal override void ProcessMarkup(XmlNode[] markup) | |||
| internal override void ProcessMarkup(XmlNode?[] markup) | |||
There was a problem hiding this comment.
Same answer as previous comment #41488 (comment).
safern
approved these changes
Aug 28, 2020
krwq
approved these changes
Aug 28, 2020
14 tasks
carlossanlop
pushed a commit
to carlossanlop/runtime
that referenced
this pull request
Aug 28, 2020
…elements (dotnet#41488) * Switch Markup property to XmlNode?[]? to reflect it can contain null elements * Update ref
ghost
locked as resolved and limited conversation to collaborators
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Switches
Markupproperty fromXmlNode[]?toXmlNode?[]?inXmlSchemaAppInfoandXmlSchemaDocumentation.