Skip to content

Fix exception thrown when reading file with closing </br> tag in drawing.vml #1081

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

Merged
tonyqus merged 2 commits into from
May 14, 2023
Merged

Fix exception thrown when reading file with closing </br> tag in drawing.vml #1081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33c07ef
Add test for exception thrown when XSSFVMLDrawing.Read reads vml with…
May 12, 2023
4736c03
Fix exception thrown when XSSFVMLDrawing.Read reads vml with an openi…
May 12, 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
2 changes: 1 addition & 1 deletion ooxml/XSSF/UserModel/XSSFVMLDrawing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ internal void Read(Stream is1)
//Stream vmlsm = new EvilUnclosedBRFixingInputStream(is1); --TODO:: add later

doc.LoadXml(
data.Replace("<br>","")
data.Replace("<br>","").Replace("</br>", "")
);

XmlNamespaceManager nsmgr = new XmlNamespaceManager(doc.NameTable);
Expand Down
11 changes: 11 additions & 0 deletions testcases/ooxml/XSSF/UserModel/TestXSSFVMLDrawing.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ public void TestFindCommentShape()
Assert.AreSame(sh_a1, newVml.FindCommentShape(0, 1));
}
[Test]
public void TestRead()
{
XSSFVMLDrawing vml = new XSSFVMLDrawing();

// Act
TestDelegate testDelegate = () => vml.Read(POIDataSamples.GetSpreadSheetInstance().OpenResourceAsStream("vmlDrawing1.vml"));

// Assert
Assert.DoesNotThrow(testDelegate);
}
[Test]
public void TestRemoveCommentShape()
{
XSSFVMLDrawing vml = new XSSFVMLDrawing();
Expand Down
3 changes: 3 additions & 0 deletions testcases/test-data/spreadsheet/vmlDrawing1.vml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<v:path o:connecttype="none"/>
<v:textbox style="mso-direction-alt:auto">
<div style="text-align:left"/>
<div style='text-align:center'>
<b>Some Text<br></br></b>
</div>
</v:textbox>
<x:ClientData ObjectType="Note">
<x:MoveWithCells/>
Expand Down