Add a method for quickly escaping a tag value.

2 files changed, 37 insertions, 0 deletions

diff --git a/include/clientprotocol.h b/include/clientprotocol.h
index f65334c43..b73370ea1 100644
--- a/include/clientprotocol.h
+++ b/include/clientprotocol.h
@@ -282,6 +282,11 @@ public:
 
 	typedef std::vector<Param> ParamList;
 
+	/** Escapes a value for use in a tag value.
+	 * @param value The value to escape.
+	 */
+	static std::string CoreExport EscapeTag(const std::string& value);
+
 private:
 	typedef std::vector<std::pair<SerializedInfo, SerializedMessage>> SerializedList;
 
diff --git a/src/clientprotocol.cpp b/src/clientprotocol.cpp
index f3838e468..8d245f0ed 100644
--- a/src/clientprotocol.cpp
+++ b/src/clientprotocol.cpp
@@ -68,6 +68,38 @@ const ClientProtocol::SerializedMessage& ClientProtocol::Serializer::SerializeFo
 	return msg.GetSerialized(Message::SerializedInfo(this, MakeTagWhitelist(user, msg.GetTags())));
 }
 
+std::string CoreExport ClientProtocol::Message::EscapeTag(const std::string& value)
+{
+	std::string ret;
+	ret.reserve(value.size());
+	for (const char& chr : value)
+	{
+		switch (chr)
+		{
+			case ' ':
+				ret.append("\\s");
+				break;
+			case ';':
+				ret.append("\\;");
+				break;
+			case '\\':
+				ret.append("\\\\");
+				break;
+			case '\n':
+				ret.append("\\n");
+				break;
+			case '\r':
+				ret.append("\\r");
+				break;
+			default:
+				ret.push_back(chr);
+				break;
+		}
+	}
+	return ret;
+}
+
+
 const ClientProtocol::SerializedMessage& ClientProtocol::Message::GetSerialized(const SerializedInfo& serializeinfo) const
 {
 	// First check if the serialized line they're asking for is in the cache