Remove newlines and carriage return when reading addresses

-Remove any newline or carriage returns when reading addresses from file

Author: brichard19

KeyFinderLib/KeyFinder.cpp

@@ -126,6 +126,7 @@ void KeyFinder::setTargets(std::string targetsFile)
 	std::string line;
 	Logger::log(LogLevel::Info, "Loading addresses from '" + targetsFile + "'");
 	while(std::getline(inFile, line)) {
+		util::removeNewline(line);
 		if(line.length() > 0) {
 			if(!Address::verifyAddress(line)) {
 				Logger::log(LogLevel::Error, "Invalid address '" + line + "'");

util/util.cpp

@@ -250,4 +250,26 @@ namespace util {
 
 		return std::string(buf);
 	}
+
+	void removeNewline(std::string &s)
+	{
+		int len = s.length();
+
+		int toRemove = 0;
+
+		if(len >= 2) {
+			if(s[len - 2] == '\r' || s[len - 2] == '\n') {
+				toRemove++;
+			}
+		}
+		if(len >= 1) {
+			if(s[len - 1] == '\r' || s[len - 1] == '\n') {
+				toRemove++;
+			}
+		}
+
+		if(toRemove) {
+			s.erase(len - toRemove);
+		}
+	}
 }

util/util.h

@@ -35,6 +35,7 @@ std::string format(const char *formatStr, double value);
 std::string format(uint32_t value);
 std::string format(uint64_t value);
 std::string format(int value);
+void removeNewline(std::string &s);
 
 }