added encoded chars stripping to KVReader

Author: chc

code/core/OS/KVReader.cpp

@@ -49,10 +49,10 @@ namespace OS {
 							line_ss.read((char *)binary_data.GetHead(), data_len);
 							line_ss.seekg(1, std::ios_base::cur);
 							value = std::string((const char *)binary_data.GetHead(), data_len);
-							m_kv_map.push_back(std::pair<std::string, std::string>(key, value));
+							m_kv_map.push_back(std::pair<std::string, std::string>(cleanup_string(key), cleanup_string(value)));
 						}
 						else {
-							m_kv_map.push_back(std::pair<std::string, std::string>(key, value));
+							m_kv_map.push_back(std::pair<std::string, std::string>(cleanup_string(key), cleanup_string(value)));
 						}
 					}
 					key = "";
@@ -129,17 +129,6 @@ namespace OS {
 		}
 		return m_kv_map.cend();
 	}
-	std::vector<std::pair<std::string, std::string>>::const_iterator KVReader::FindValue(std::string key) {
-		std::vector<std::pair<std::string, std::string>>::const_iterator it = m_kv_map.cbegin();
-		while (it != m_kv_map.cend()) {
-			std::pair<std::string, std::string> p = *it;
-			if (p.second.compare(key) == 0) {
-				return it;
-			}
-			it++;
-		}
-		return m_kv_map.cend();
-	}
 	std::map<std::string, std::string> KVReader::GetKVMap() const {
 		std::map<std::string, std::string> ret;
 		std::vector<std::pair<std::string, std::string>>::const_iterator it = m_kv_map.cbegin();
@@ -168,4 +157,21 @@ namespace OS {
 		}
 		return ret;
 	}
+	/*
+		This cleanup is due to issues handling encodings. Games will send data of *any* code page, and the json serialzier would reject those chars resulting in a crash
+
+		for the user input data we should base64 encode / decode instead, but for now, this will just strip those chars out
+	*/
+	std::string KVReader::cleanup_string(std::string input) {
+		std::string::iterator it = input.begin();
+		std::string result;
+		while(it != input.end()) {
+			char ch = *it;
+			if(ch <= 127) {
+				result += ch;
+			}
+			it++;
+		}
+		return result;
+	}
 }

code/core/OS/KVReader.h

@@ -33,7 +33,7 @@ namespace OS {
 		int GetIndex(int n); //map internal index to external index
 		bool IsDataKey(std::string key);
 		std::vector<std::pair<std::string, std::string> >::const_iterator FindKey(std::string key);
-		std::vector<std::pair<std::string, std::string> >::const_iterator FindValue(std::string key);
+		std::string cleanup_string(std::string input);
 		std::vector< std::pair<std::string, std::string> > m_kv_map;
 		char m_delimitor;
 		char m_line_delimitor;