FSCORE-370

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

diff --git a/src/switch_channel.c b/src/switch_channel.c
index 880d7a4b495fc4846a394389208241586ff752a5..b865cdedf02eff6c26c39295a6d1c00a9311fbfa 100644 (file)
--- 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 1c46ebdb6de7ffea4ab24e4c8a132076f4c41b97..272a0db78eee4be974d9160e974b7abf7cc32e4f 100644 (file)
--- 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) {