From: Nathan Neulinger <nneul@neulinger.org>
Date: Fri, 31 May 2013 21:31:27 +0000 (-0500)
Subject: FS-5449: apply correct quoting, got older version of patch accidentally
X-Git-Tag: v1.2.13~267
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc39b775205e06fdec383362e06a3c6a7c50019c;p=thirdparty%2Ffreeswitch.git

FS-5449: apply correct quoting, got older version of patch accidentally
---

diff --git a/src/switch_utils.c b/src/switch_utils.c
index b3c6c40c19..3dbb61da94 100644
--- a/src/switch_utils.c
+++ b/src/switch_utils.c
@@ -2371,8 +2371,8 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 		switch (string[i]) {
 #ifndef WIN32
 		case '\'':
-			/* We replace ' by sq dq sq dq sq, so need 4 additional bytes */
-			dest_len += 4;
+			/* We replace ' by sq backslace sq sq, so need 3 additional bytes */
+			dest_len += 3;
 			break;
 #endif
 		}
@@ -2380,7 +2380,7 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 	dest_len += 1; /* closing quote */
 
 	/* if we're given a pool, allocate from it, otherwise use malloc */
-	if ( pool ) {
+	if (pool) {
 		dest = switch_core_alloc(pool, sizeof(char) * dest_len);
 	} else {
 		dest = (char *) malloc(sizeof(char) * dest_len);
@@ -2402,11 +2402,10 @@ SWITCH_DECLARE(char *) switch_util_quote_shell_arg_pool(const char *string, swit
 			break;
 #else
 		case '\'':
-			/* We replace ' by sq dq sq dq sq */
+			/* We replace ' by sq backslash sq sq */
 			dest[n++] = '\'';
-			dest[n++] = '"';
+			dest[n++] = '\\';
 			dest[n++] = '\'';
-			dest[n++] = '"';
 			dest[n++] = '\'';
 			break;
 #endif