Handle closing flow sequence after explicit key #295
Merged
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
Currently after an explicit flow key '?' in a flow sequence, an immediately
following closing ] is ignored by the parser:
% echo '[ ? ]' | ./tests/run-parser-test-suite --flow keep
+STR
+DOC
+SEQ []
+MAP {}
=VAL :
=VAL :
-MAP
Parse error: did not find expected ',' or ']'
Line: 2 Column: 1
% echo '[ ? ] ]' | ./tests/run-parser-test-suite --flow keep
+STR
+DOC
+SEQ []
+MAP {}
=VAL :
=VAL :
-MAP
-SEQ
-DOC
-STR
It is read correctly by the scanner as a YAML_FLOW_SEQUENCE_END_TOKEN, and
the flow_level is decreased. Then it is passed to the parser where it gets
ignored.
This leads to invalid YAML being accepted, and valid YAML resulting in an
error.
Also the flow_level is incorrectly decreased, so you can nest sequences
like that without running in to the MAX_NESTING_LEVEL.
ingydotnet
reviewed
May 6, 2024
Those are not affected by the code and work like expected already.
I will add tests to the yaml-test-suite. |
|
Oh you are right. Misread again. |
ingydotnet
approved these changes
May 6, 2024
perlpunk
added a commit
to perlpunk/libyaml
that referenced
this pull request
May 20, 2024
The fix in yaml#295 was not correct. # cat a.yaml [?] # Before % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': run-loader: loader.c:470: yaml_parser_load_sequence_end: Assertion `parser->document->nodes.start[index-1].type == YAML_SEQUENCE_NODE' failed. [1] 21446 IOT instruction (core dumped) ./tests/run-loader a.yaml # After % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} =VAL : =VAL : -MAP -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': SUCCESS (1 documents)
perlpunk
added a commit
to perlpunk/libyaml
that referenced
this pull request
May 20, 2024
The fix in yaml#295 was not correct. # cat a.yaml --- [?] # Before % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': run-loader: loader.c:470: yaml_parser_load_sequence_end: Assertion `parser->document->nodes.start[index-1].type == YAML_SEQUENCE_NODE' failed. [1] 21446 IOT instruction (core dumped) ./tests/run-loader a.yaml # After % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} =VAL : =VAL : -MAP -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': SUCCESS (1 documents)
perlpunk
added a commit
to perlpunk/libyaml
that referenced
this pull request
May 20, 2024
The fix in yaml#295 was not correct. # cat a.yaml --- [?] # Before % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': run-loader: loader.c:470: yaml_parser_load_sequence_end: Assertion `parser->document->nodes.start[index-1].type == YAML_SEQUENCE_NODE' failed. [1] 21446 IOT instruction (core dumped) ./tests/run-loader a.yaml # After % ./tests/run-parser-test-suite --flow keep < a.yaml +STR +DOC --- +SEQ [] +MAP {} =VAL : =VAL : -MAP -SEQ -DOC -STR % ./tests/run-loader a.yaml [1] Loading 'a.yaml': SUCCESS (1 documents)
|
This PR caused a problem, and is now fixed with #296 |
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.
Currently after an explicit flow key '?' in a flow sequence, an immediately following closing ] is ignored by the parser:
It is read correctly by the scanner as a YAML_FLOW_SEQUENCE_END_TOKEN, and the flow_level is decreased. Then it is passed to the parser where it gets ignored.
This leads to invalid YAML being accepted, and valid YAML resulting in an error.
Also the flow_level is incorrectly decreased, so you can nest sequences like that without running in to the MAX_NESTING_LEVEL.