Add more segInfo header check

Author: sam-astro

dcc_client/dcc_client/P2PClient.cpp

@@ -310,10 +310,12 @@ void P2P::ListenerThread(int update_interval)
 					maxSegments = 0;
 					int segLength;
 					try{
-						segInfo = SplitString(textVal, "&")[0];
-						std::string s = SplitString(textVal, "&")[1]; // This value is not used, but tested to ensure the segInfo header is there
+						if(!StringContains(textVal, '&'))
+							throw 1;
 						if(StringStartsWith(segInfo, "seg") == false)
 							throw 1;
+						segInfo = SplitString(textVal, "&")[0];
+						std::string s = SplitString(textVal, "&")[1]; // This value is not used, but tested to ensure the segInfo header is there
 						segNumber = std::stoi(SplitString(segInfo, ":")[1]);
 						maxSegments = std::stoi(SplitString(segInfo, ":")[3]);
 						segLength = std::stoi(SplitString(segInfo, ":")[5]) + segInfo.size() + 1;

dcc_client/dcc_client/strops.cpp

@@ -166,6 +166,15 @@ bool StringContains(std::string& str, std::string check)
 	}
 	return false;
 }
+// See if a string <str> contains another <check>
+bool StringContains(std::string& str, char check)
+{
+	if (str.find(check, 0) < str.size())
+	{
+		return true;
+	}
+	return false;
+}
 
 // trim from start (in place)
 void ltrim(std::string& s)

dcc_client/dcc_client/strops.h

@@ -23,6 +23,7 @@ std::string PadStringRight(const std::string& input, char padChar, size_t desire
 std::string ExtractPaddedChars(const std::string& input, char padChar);
 std::vector<std::string> SplitString(std::string& str, std::string delim);
 bool StringContains(std::string& str, std::string check);
+bool StringContains(std::string& str, char check);
 void ltrim(std::string& s);
 void rtrim(std::string& s);
 // Overridden by boost::trim

dcc_client/out-linux/dcc_client/CMakeFiles/dcc_client.dir/P2PClient.cpp.o

@@ -35316,6 +35316,7 @@ State	dcc_client/out-linux/_deps/curl-src/src/tool_cfgable.h	/^struct State {$/;
 State	dcc_client/out/_deps/curl-src/src/tool_cfgable.h	/^struct State {$/;"	s
 Stop	dcc_client/out-linux/_deps/cpr-src/test/abstractServer.cpp	/^void AbstractServer::Stop() {$/;"	f	class:cpr::AbstractServer	typeref:typename:void
 Stream	dcc_client/dcc_client/indicators.hpp	/^using Stream = details::Setting<std::ostream &, details::ProgressBarOption::stream>;$/;"	t	namespace:indicators::option	typeref:typename:details::Setting<std::ostream &,details::ProgressBarOption::stream>
+StringContains	dcc_client/dcc_client/strops.cpp	/^bool StringContains(std::string& str, char check)$/;"	f	typeref:typename:bool
 StringContains	dcc_client/dcc_client/strops.cpp	/^bool StringContains(std::string& str, std::string check)$/;"	f	typeref:typename:bool
 StringHolder	dcc_client/out-linux/_deps/cpr-src/include/cpr/cprtypes.h	/^    StringHolder(const char* str, size_t len) : str_(str, len) {}$/;"	f	class:cpr::StringHolder
 StringHolder	dcc_client/out-linux/_deps/cpr-src/include/cpr/cprtypes.h	/^    StringHolder(const std::initializer_list<std::string> args) {$/;"	f	class:cpr::StringHolder