kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-01 11:32:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 189464 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@189525 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2009-04-20 21:31:36 +00:00
parent b48cda78d3
commit c3a9db2bf6
2 changed files with 403 additions and 381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

775
res/ael/ael.tab.c
View File

File diff suppressed because it is too large Load Diff

9
res/ael/ael.y
View File

@@ -407,6 +407,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;}