3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

Fix a infinite skip_comment check in Paragraphs.cpp

Browse Source 
This happens when git not checkout file's line break as CR-LF.
When CONTROL file contains comment followed by \n instead of \r\n, there will be a infinite skip_comment check.
This commit is contained in:
sdcb 2017-04-05 17:12:32 +08:00
parent d9a4034539
commit 928ff24cbc
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/src/Paragraphs.cpp
View File

@ -34,7 +34,7 @@ namespace vcpkg::Paragraphs
void skip_comment(char& ch)
{
while (ch != '\r')
while (ch != '\r' && ch != '\n' && ch != '\0')
next(ch);
if (ch == '\r')
next(ch);

10
toolsrc/src/tests_paragraph.cpp
View File

@ -289,6 +289,16 @@ namespace UnitTest1
Assert::AreEqual("v4", pghs[1]["f4"].c_str());
}
TEST_METHOD(parse_comment_before_single_slashN)
{
const char* str =
"f1: v1\r\n"
"#comment\n";
auto pghs = vcpkg::Paragraphs::parse_paragraphs(str).value_or_exit(VCPKG_LINE_INFO);
Assert::AreEqual(size_t(1), pghs[0].size());
Assert::AreEqual("v1", pghs[0]["f1"].c_str());
}
TEST_METHOD(BinaryParagraph_serialize_min)
{
std::stringstream ss;