Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[2201.7.x] Fix OOM error when parsing XML CData #41745

Merged
merged 3 commits into from
Nov 22, 2023
Merged

[2201.7.x] Fix OOM error when parsing XML CData #41745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a57710
Fix OOM error with parsing XML CData
Nadeeshan96 Nov 9, 2023
2d4d92c
Add test with XML CData
Nadeeshan96 Nov 9, 2023
593560e
Merge branch '2201.7.x' into 7x-oom-cdata
Nadeeshan96 Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/XmlTreeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ public BXml parse() {
readComment(xmlStreamReader);
break;
case CDATA:
readCData(xmlStreamReader);
break;
case CHARACTERS:
readText(xmlStreamReader);
readNext = true;
Expand Down Expand Up @@ -158,6 +160,10 @@ private void readPI(XMLStreamReader xmlStreamReader) {
siblingDeque.peek().add(xmlItem);
}

private void readCData(XMLStreamReader xmlStreamReader) {
siblingDeque.peek().add(new XmlText(xmlStreamReader.getText()));
}

private void readText(XMLStreamReader xmlStreamReader) throws XMLStreamException {
StringBuilder textBuilder = new StringBuilder();
while (xmlStreamReader.getEventType() == CHARACTERS) {
Expand Down
4 changes: 4 additions & 0 deletions langlib/langlib-test/src/test/resources/test-src/xmllib_test.bal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,6 +943,10 @@ function fromStringTest() {
if !(d[3] is xml:Comment) {
panic error("Assertion error: not a comment");
}

string xmlString = string `<Description><![CDATA[OK]]></Description>`;
xml xmlWithCData = checkpanic xml:fromString(xmlString);
assertEquals(xmlWithCData, xml `<Description>OK</Description>`);
}

function testXmlIteratorNextInvocations() {
Expand Down
Loading