diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-11 04:40:56 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-10-11 04:40:56 +0000 |
| commit | e18926078a622d7369f7a224b86040ed1ab17231 (patch) | |
| tree | 3b7b5e8f1587601f6ba58b80bfcb4b67c9c0a92f /main | |
| parent | 80350e556730d756807db31cd3f644afab151547 (diff) | |
Merged revisions 85356 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85356 | tilghman | 2007-10-10 23:35:33 -0500 (Wed, 10 Oct 2007) | 2 lines
A dollar sign by itself, not indicating a start of a variable or expression prematurely ends substitution (closes issue #10939)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@85357 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index c1046fe39..2782b57c6 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -1645,6 +1645,8 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v nextexp = nextthing; pos = nextexp - whereweare; break; + default: + pos = 1; } } @@ -1800,8 +1802,7 @@ static void pbx_substitute_variables_helper_full(struct ast_channel *c, struct v count -= length; cp2 += length; } - } else - break; + } } } |