From d875d23de5aa64630e97e6d96412f15ed0c25d8f Mon Sep 17 00:00:00 2001
From: Anthony Minessale <anthony.minessale@gmail.com>
Date: Thu, 21 May 2009 20:10:24 +0000
Subject: [PATCH] FSCORE-370

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@13414 d0543943-73ff-0310-b7d9-9358b9ac24b2
---
 src/switch_channel.c | 2 +-
 src/switch_event.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 880d7a4b49..b865cdedf0 100644
--- a/src/switch_channel.c
+++ b/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) {
diff --git a/src/switch_event.c b/src/switch_event.c
index 1c46ebdb6d..272a0db78e 100644
--- a/src/switch_event.c
+++ b/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) {