diff options
author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 21:36:33 +0000 |
---|---|---|
committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-20 21:36:33 +0000 |
commit | 4e2342bb2d4320d65c9199b2f654cb6069497adf (patch) | |
tree | e81f85c3189672aacc43f4b075be0b1ea2808237 /res/ael/ael.y | |
parent | 341d047f18578c95c6cd4fe3a3741bf239f8a81b (diff) |
Merged revisions 189464 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r189464 | seanbright | 2009-04-20 17:09:59 -0400 (Mon, 20 Apr 2009) | 20 lines
Merged revisions 189462 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r189462 | seanbright | 2009-04-20 16:58:39 -0400 (Mon, 20 Apr 2009) | 13 lines
Properly handle @s within hints in AEL.
AEL was not handling the case of a device hint containing an @ symbol, which
caused parking hints (e.g. hint(park:exten@context)) to error out the parser.
This patch makes AEL treat the @ the same way it treats colon and ampersand
now, meaning the characters are included in verbatim.
(closes issue #14941)
Reported by: bpgoldsb
Patches:
bug14941.patch uploaded by seanbright (license 71)
Tested by: bpgoldsb
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@189533 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/ael/ael.y')
-rw-r--r-- | res/ael/ael.y | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/res/ael/ael.y b/res/ael/ael.y index f8398dd2e..c8bc9c78e 100644 --- a/res/ael/ael.y +++ b/res/ael/ael.y @@ -402,6 +402,15 @@ hint_word : word { $$ = $1; } free($3); } } + | hint_word AT word { + if (asprintf(&($$), "%s@%s", $1, $3) < 0) { + ast_log(LOG_WARNING, "asprintf() failed\n"); + $$ = NULL; + } else { + free($1); + free($3); + } + } ; word3_list : word { $$ = $1;} |