ini.cpp: Fix empty \r\n line parsing

glebm · glebm · commit d8dde8d2b119 · 2024-11-09T08:58:22.000Z
diff --git a/Source/utils/ini.cpp b/Source/utils/ini.cpp
@@ -117,7 +117,7 @@ tl::expected<Ini, std::string> Ini::parse(std::string_view buffer)
 			nextLineBegin = eof;
 		} else {
 			nextLineBegin = lineEnd + 1;
-			if (lineBegin + 1 < lineEnd && *(lineEnd - 1) == '\r') --lineEnd;
+			if (lineBegin + 1 <= lineEnd && *(lineEnd - 1) == '\r') --lineEnd;
 		}
 		const char *keyBegin = SkipLeadingWhitespace(lineBegin, lineEnd);
 		if (keyBegin == lineEnd) continue;

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ tl::expected<Ini, std::string> Ini::parse(std::string_view buffer)`
`117`	`117`	`nextLineBegin = eof;`
`118`	`118`	`} else {`
`119`	`119`	`nextLineBegin = lineEnd + 1;`
`120`		`- if (lineBegin + 1 < lineEnd && *(lineEnd - 1) == '\r') --lineEnd;`
	`120`	`+ if (lineBegin + 1 <= lineEnd && *(lineEnd - 1) == '\r') --lineEnd;`
`121`	`121`	`}`
`122`	`122`	`const char *keyBegin = SkipLeadingWhitespace(lineBegin, lineEnd);`
`123`	`123`	`if (keyBegin == lineEnd) continue;`