Fix invalid XML Buffer Overflow Error #1201
Merged
Conversation
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
waahm7
commented
May 9, 2025
| distributionBase=GRADLE_USER_HOME | ||
| distributionPath=wrapper/dists | ||
| distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip |
There was a problem hiding this comment.
VSCode promoted me to upgrade Gradle.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #1201 +/- ##
==========================================
- Coverage 84.25% 84.25% -0.01%
==========================================
Files 57 57
Lines 5984 5989 +5
==========================================
+ Hits 5042 5046 +4
- Misses 942 943 +1 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
DmitriyMusatkin
approved these changes
May 9, 2025
tests/xml_parser_test.c
Outdated
| @@ -95,6 +95,25 @@ static int s_xml_parser_child_with_text_test(struct aws_allocator *allocator, vo | |||
|
|
|||
| AWS_TEST_CASE(xml_parser_child_with_text, s_xml_parser_child_with_text_test) | |||
|
|
|||
| const char *malformed = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><rootNode>><child1>TestBody</child1></rootNode>"; | |||
|
|
|||
| static int s_xml_parser_malformed_test(struct aws_allocator *allocator, void *ctx) { | |||
There was a problem hiding this comment.
nit: i would call out exactly what is malformed in this test, in case we want to add more malformed tests
TingDaoK
approved these changes
May 9, 2025
source/xml_parser.c
Outdated
| size_t node_name_len = end_location - next_location; | ||
|
|
||
| size_t node_name_len; | ||
| if (aws_sub_size_checked((size_t)end_location, (size_t)next_location, &node_name_len)) { |
There was a problem hiding this comment.
maybe use an if check against the pointer, which will be safer
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.
Description of changes:
Our XML parser assumes that the XML provided is valid and is intended for internal use only. I have fixed buffer overflow for some cases as it's nice to fix them but there might be other issues with invalid XML.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.