test/MiniExcel
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/MiniExcel.git synced 2024-11-29 18:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #630 from meld-cp/master

Browse Source 
Fix potential endless loop
This commit is contained in:
meld-cp 2024-07-13 12:07:35 +12:00 committed by GitHub
commit 4fd14f2174
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/MiniExcel/Csv/CsvReader.cs
View File

@ -39,7 +39,12 @@ namespace MiniExcelLibs.Csv
{
while (finalRow.Count(c => c == '"') % 2 != 0)
{
finalRow += string.Concat( _config.NewLine, reader.ReadLine());
var nextPart = reader.ReadLine();
if (nextPart == null)
{
break;
}
finalRow = string.Concat(finalRow, _config.NewLine, nextPart);
}
}
read = Split(finalRow);

32
tests/MiniExcelTests/MiniExcelIssueTests.cs
View File

@ -3556,7 +3556,8 @@ MyProperty4,MyProperty1,MyProperty5,MyProperty2,MyProperty6,,MyProperty3
new() { A = "Microsoft\"\" \r\nTest\n3", B = DateTime.Parse("2021-02-01"), C = "a\"\"\nb\n\nc", D = 123 },
};
var config = new CsvConfiguration() {
var config = new CsvConfiguration()
{
//AlwaysQuote = true,
ReadLineBreaksWithinQuotes = true,
};
@ -3599,13 +3600,15 @@ MyProperty4,MyProperty1,MyProperty5,MyProperty2,MyProperty6,,MyProperty3
new() { B = DateTime.Parse("2021-02-01"), D = 123 },
};
var config = new CsvConfiguration() {
var config = new CsvConfiguration()
{
//AlwaysQuote = true,
ReadLineBreaksWithinQuotes = true,
};
// create
using (var stream = File.Create(path)) {
using (var stream = File.Create(path))
{
stream.SaveAs(values, excelType: ExcelType.CSV, configuration: config);
}
@ -3615,5 +3618,28 @@ MyProperty4,MyProperty1,MyProperty5,MyProperty2,MyProperty6,,MyProperty3
Assert.Equal(values.Length, getRowsInfo.Count());
}
[Fact]
public void Issue507_3_MismatchedQuoteCsv() {
//Problem with multi-line when using Query func
//https://github.com/mini-software/MiniExcel/issues/507
var config = new CsvConfiguration()
{
//AlwaysQuote = true,
ReadLineBreaksWithinQuotes = true,
};
var badCsv = "A,B,C\n\"r1a: no end quote,r1b,r1c";
// create
using var stream = new MemoryStream( Encoding.UTF8.GetBytes( badCsv ) );
// read
var getRowsInfo = MiniExcel.Query( stream, excelType: ExcelType.CSV, configuration: config ).ToArray();
Assert.Equal(2, getRowsInfo.Length );
}
}
}