FSCORE-370

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13414 d0543943-73ff-0310-b7d9-9358b9ac24b2

src/switch_channel.c

@@ -1985,12 +1985,12 @@ SWITCH_DECLARE(char *) switch_channel_expand_variables(switch_channel_t *channel
 			if (*p == '\\') {
 				if (*(p + 1) == '$') {
 					nv = 1;
+					p++;
 				} else if (*(p + 1) == '\\') {
 					*c++ = *p++;
 					len++;
 					continue;
 				}
-				p++;
 			}
 
 			if (*p == '$' && !nv) {

src/switch_event.c

@@ -1353,12 +1353,12 @@ SWITCH_DECLARE(char *) switch_event_expand_headers(switch_event_t *event, const
 			if (*p == '\\') {
 				if (*(p + 1) == '$') {
 					nv = 1;
+					p++;
 				} else if (*(p + 1) == '\\') {
 					*c++ = *p++;
 					len++;
 					continue;
 				}
-				p++;
 			}
 
 			if (*p == '$' && !nv) {