Split the lines

danielga · Jan 16, 2020 · 4da8961 · 4da8961
1 parent a1c588f
commit 4da8961
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/source/whitelist.cpp b/source/whitelist.cpp
@@ -26,10 +26,16 @@ int parseWhitelist()
 		std::stringstream filereader;
 		filereader << input.rdbuf();
 		std::string filedata = filereader.str();
-		std::regex line_parser("[ \t]*([\\w\\.-]+)\\:(\\d+)(?:(?:[ \t]*\r?\n)+|[ \t]*$)");
-		for (std::regex_iterator<std::string::iterator> match = std::regex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::regex_iterator<std::string::iterator>(); match != end; ++match)
+		std::regex line_parser("(?:(?!\r?\n).)+");
+		std::regex entry_parser("^[ \\t]*([\\w\\.-]+)\\:(\\d+)[ \\t]*$");
+		for (std::sregex_iterator line = std::sregex_iterator(filedata.begin(), filedata.end(), line_parser), end = std::sregex_iterator(); line != end; ++line)
 		{
-			whitelist[match->operator[](1).str()].insert(match->operator[](2).str());
+			const std::string& linestr = line->operator[](0);
+			std::smatch match;
+			if(std::regex_match(linestr, match, entry_parser))
+			{
+				whitelist[match[1].str()].insert(match[2].str());
+			}
 		}
 		if (whitelist.empty())
 		{