From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 2 Oct 2012 16:56:21 +0000 (-0500)
Subject: FS-4675 --resolve
X-Git-Tag: v1.3.0~130
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10657f3f5c1fb00d6b8e85d3956c170695b169bd;p=thirdparty%2Ffreeswitch.git

FS-4675 --resolve
---

diff --git a/src/mod/applications/mod_commands/mod_commands.c b/src/mod/applications/mod_commands/mod_commands.c
index d823af7194..892d6e7479 100644
--- a/src/mod/applications/mod_commands/mod_commands.c
+++ b/src/mod/applications/mod_commands/mod_commands.c
@@ -1563,15 +1563,19 @@ SWITCH_STANDARD_API(regex_function)
 	proceed = switch_regex_perform(argv[0], argv[1], &re, ovector, sizeof(ovector) / sizeof(ovector[0]));
 
 	if (argc > 2) {
-		len = (strlen(argv[0]) + strlen(argv[2]) + 10) * proceed;
-		substituted = malloc(len);
-		switch_assert(substituted);
-		memset(substituted, 0, len);
-		switch_replace_char(argv[2], '%', '$', SWITCH_FALSE);
-		switch_perform_substitution(re, proceed, argv[2], argv[0], substituted, len, ovector);
-
-		stream->write_function(stream, "%s", substituted);
-		free(substituted);
+		if (proceed) {
+			len = (strlen(argv[0]) + strlen(argv[2]) + 10) * proceed;
+			substituted = malloc(len);
+			switch_assert(substituted);
+			memset(substituted, 0, len);
+			switch_replace_char(argv[2], '%', '$', SWITCH_FALSE);
+			switch_perform_substitution(re, proceed, argv[2], argv[0], substituted, len, ovector);
+
+			stream->write_function(stream, "%s", substituted);
+			free(substituted);
+		} else {
+			stream->write_function(stream, "%s", argv[0]);
+		}
 	} else {
 		stream->write_function(stream, proceed ? "true" : "false");
 	}