Hotfix for the infinite loop if structured type has property which type is the declaring type #1855
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
xuzhg
requested review from
mikepizzo,
chrisspre,
gathogojr,
habbes and
Sreejithpin
xuzhg
force-pushed
the
fixinfinitLoopInUriValidation
branch
from
579dc04 to
ec243eb
Compare
Sreejithpin
approved these changes
Aug 15, 2020
mikepizzo
reviewed
Aug 17, 2020
| @@ -413,14 +413,21 @@ private void ValidateImpliedProperties(IEdmType segmentType, SelectExpandClause | |||
| // Validate all structured properties of a type, recursing through nested complex typed properties | |||
| private void ValidateProperties(IEdmType edmType, ODataUrlValidationContext context) | |||
| { | |||
| IEdmStructuredType structuredType = edmType as IEdmStructuredType; | |||
| if (structuredType != null) | |||
| if (!context.ValidatedTypes.Contains(edmType)) | |||
There was a problem hiding this comment.
(!context.ValidatedTypes.Contains(edmType) [](start = 15, length = 42)
ISet.Add returns false if the item was already in the list, so you can replace 416 with:
if (context.ValidatedTypes.Add(edmType))
and remove line 418, avoiding the extra look-up.
mikepizzo
requested changes
Aug 17, 2020
…pe is the declaring type
xuzhg
force-pushed
the
fixinfinitLoopInUriValidation
branch
from
ec243eb to
ad75d0c
Compare
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.
Issues
This pull request fixes issue #xxx.
Description
The Url validation will go into Infinite loop if a structured type has the property which type is the declaring type.
Below is the call stack.
This PR is the hot fix to fix it.
Checklist (Uncheck if it is not completed)
Additional work necessary
If documentation update is needed, please add "Docs Needed" label to the issue and provide details about the required document change in the issue.