From 0762d6d0bdd182a2b0949ab74202df7c3cea9222 Mon Sep 17 00:00:00 2001
From: icedream <icedream2k9@die-optimisten.net>
Date: Tue, 27 Oct 2015 23:38:14 +0100
Subject: [PATCH] Fix line breaks and tabs not being properly escaped in
 ts3query.iced.

---
 ts3query.iced | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/ts3query.iced b/ts3query.iced
index a9505e6..3b1b076 100644
--- a/ts3query.iced
+++ b/ts3query.iced
@@ -10,9 +10,23 @@ merge = require "merge"
 
 parserLog = getLogger "parser"
 
-escape = (value) => value.toString().replace(///\\///g, "\\\\").replace(/\//g, "\\/").replace(/\|/g, "\\|").replace(///\ ///g, "\\s")
+escape = (value) => value.toString()\
+	.replace(/\\/g, "\\\\")\
+	.replace(/\//g, "\\/")\
+	.replace(/\|/g, "\\|")\
+	.replace(/\n/g, "\\n")\
+	.replace(/\r/g, "\\r")\
+	.replace(/\t/g, "\\t")\
+	.replace(/\ /g, "\\s")
 
-unescape = (value) => value.toString().replace(/\\s/g, " ").replace(/\\\//g, "/").replace(/\\\|/g, "|").replace(/\\\\/g, "\\")
+unescape = (value) => value.toString()\
+	.replace(/\\s/g, " ")\
+	.replace(/\\t/g, "\t")\
+	.replace(/\\r/g, "\r")\
+	.replace(/\\n/g, "\n")\
+	.replace(/\\\|/g, "|")\
+	.replace(/\\\//g, "/")\
+	.replace(/\\\\/g, "\\")
 
 buildCmd = (name, namedArgs, posArgs) =>
 	# TODO: Add support for collected arguments (aka lists)