From 412835d7fac699a7224dcdbb5aba971ece8de2fc Mon Sep 17 00:00:00 2001
From: KimLS <KLS@peqtgc.com>
Date: Sun, 24 Aug 2014 16:26:51 -0700
Subject: [PATCH] Basic string tests, plus fix for StringFormat returning a
 std::string that was just very subtley malformed.

---
 common/string_util.cpp | 41 ++++++++++++++++++++++++++++++++++++++++-
 common/string_util.h   |  1 +
 tests/CMakeLists.txt   |  5 +++--
 tests/main.cpp         |  2 ++
 4 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/common/string_util.cpp b/common/string_util.cpp
index 0ccd0e4ef..2fcb59e05 100644
--- a/common/string_util.cpp
+++ b/common/string_util.cpp
@@ -53,10 +53,11 @@ const std::string vStringFormat(const char* format, va_list args)
 		return "";
 	}
 	else if ((unsigned int)characters_used > output.capacity()) {
-		output.resize(characters_used+1);
+		output.resize(characters_used + 1);
 		va_copy(tmpargs,args);
 		characters_used = vsnprintf(&output[0], output.capacity(), format, tmpargs);
 		va_end(tmpargs);
+		output.resize(characters_used);
 
 		if (characters_used < 0) {
 			// We shouldn't have a format error by this point, but I can't imagine what error we
@@ -72,6 +73,8 @@ const std::string vStringFormat(const char* format, va_list args)
 		characters_used = vsnprintf(&output[0], output.capacity(), format, tmpargs);
 		va_end(tmpargs);
 
+		output.resize(characters_used);
+
 		if (characters_used < 0) {
 			// We shouldn't have a format error by this point, but I can't imagine what error we
 			// could have by this point. Still, return empty string;
@@ -380,6 +383,42 @@ std::string EscapeString(const std::string &s) {
 	return ret;
 }
 
+std::string EscapeString(const char *src, size_t sz) {
+	std::string ret;
+
+	for(size_t i = 0; i < sz; ++i) {
+		char c = src[i];
+		switch(c) {
+		case '\x00':
+			ret += "\\x00";
+			break;
+		case '\n':
+			ret += "\\n";
+			break;
+		case '\r':
+			ret += "\\r";
+			break;
+		case '\\':
+			ret += "\\\\";
+			break;
+		case '\'':
+			ret += "\\'";
+			break;
+		case '\"':
+			ret += "\\\"";
+			break;
+		case '\x1a':
+			ret += "\\x1a";
+			break;
+		default:
+			ret.push_back(c);
+			break;
+		}
+	}
+
+	return ret;
+}
+
 bool isAlphaNumeric(const char *text)
 {
 	for (unsigned int charIndex=0; charIndex<strlen(text); charIndex++) {
diff --git a/common/string_util.h b/common/string_util.h
index fe7e83edf..34f08b5e2 100644
--- a/common/string_util.h
+++ b/common/string_util.h
@@ -26,6 +26,7 @@
 const std::string vStringFormat(const char* format, va_list args);
 const std::string StringFormat(const char* format, ...);
 std::string EscapeString(const std::string &s);
+std::string EscapeString(const char *src, size_t sz);
 
 const char *MakeLowerString(const char *source);
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4c4f32f0d..f7972e98f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,12 +7,13 @@ SET(tests_sources
 )
 
 SET(tests_headers
+	atobool_test.h
 	fixed_memory_test.h
 	fixed_memory_variable_test.h
+	hextoi_32_64_test.h
 	ipc_mutex_test.h
 	memory_mapped_file_test.h
-	atobool_test.h
-	hextoi_32_64_test.h
+	string_util_test.h
 )
 
 ADD_EXECUTABLE(tests ${tests_sources} ${tests_headers})
diff --git a/tests/main.cpp b/tests/main.cpp
index fd0862edb..285460da4 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -26,6 +26,7 @@
 #include "fixed_memory_variable_test.h"
 #include "atobool_test.h"
 #include "hextoi_32_64_test.h"
+#include "string_util_test.h"
 
 int main() {
 	try {
@@ -38,6 +39,7 @@ int main() {
 		tests.add(new FixedMemoryVariableHashTest());
 		tests.add(new atoboolTest());
 		tests.add(new hextoi_32_64_Test());
+		tests.add(new StringUtilTest());
 		tests.run(*output, true);
 	} catch(...) {
 		return -1;