Fix to #34960 - System.Text.Json.JsonReaderException: '0x00' is invalid after a single JSON value. Expected end of data #34969
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
…id after a single JSON value. Expected end of data When entity or collection of entities is mapped to JSON null value for that object can be represented either as relational null, or as JSON with null value inside 'null'. Problem was that IncludeJsonEntityReference and IncludeJsonEntityCollection were only checking for null value, and not for the JSON 'null'. (MaterializeJsonEntity and MaterializeJsonEntityCollection had the logic for both) Fix is to add the missing logic so that upon encountering Null token we just return, rather than run shaper code for the entity. Also added some validation that throws if StartObject is not the first token (again, copying logic from MaterializeJsonEntity method) Fixes #34960
roji
approved these changes
Oct 26, 2024
| var manager = new Utf8JsonReaderManager(jsonReaderData, queryContext.QueryLogger); | ||
| var tokenType = manager.CurrentReader.TokenType; | ||
|
|
||
| if (tokenType == JsonTokenType.Null) |
There was a problem hiding this comment.
nit: consider having a switch statement (multiple conditions checking the same tokenType).
| { | ||
| await base.Seed34960(ctx); | ||
|
|
||
| // JSON nulls |
There was a problem hiding this comment.
Also check that we throw the correct exceptions for invalid JSON (e.g. scalar, array)?
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.
When entity or collection of entities is mapped to JSON null value for that object can be represented either as relational null, or as JSON with null value inside 'null'. Problem was that IncludeJsonEntityReference and IncludeJsonEntityCollection were only checking for null value, and not for the JSON 'null'. (MaterializeJsonEntity and MaterializeJsonEntityCollection had the logic for both)
Fix is to add the missing logic so that upon encountering Null token we just return, rather than run shaper code for the entity. Also added some validation that throws if StartObject is not the first token (again, copying logic from MaterializeJsonEntity method)
Fixes #34960