diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 19:24:59 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-04 19:24:59 +0000 |
| commit | 529951d632c2b49177bc9c382293a66492bb8678 (patch) | |
| tree | f2c5b0154e334ad07959a88d5cd9a07f5a54b48e /main | |
| parent | 3c05737b3d09b4e26c7412ee5aef32d444805015 (diff) | |
Merged revisions 180194 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r180194 | file | 2009-03-04 15:22:50 -0400 (Wed, 04 Mar 2009) | 4 lines
Look for the number in a callerid string starting from the end. This way a value using <> can exist in the name portion.
(issue #AST-194)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180195 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/callerid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/callerid.c b/main/callerid.c index 603ac2722..89b978881 100644 --- a/main/callerid.c +++ b/main/callerid.c @@ -1008,7 +1008,7 @@ int ast_callerid_parse(char *instr, char **name, char **location) char *ns, *ne, *ls, *le; /* Try "name" <location> format or name <location> format */ - if ((ls = strchr(instr, '<')) && (le = strchr(ls, '>'))) { + if ((ls = strrchr(instr, '<')) && (le = strrchr(ls, '>'))) { *ls = *le = '\0'; /* location found, trim off the brackets */ *location = ls + 1; /* and this is the result */ if ((ns = strchr(instr, '"')) && (ne = strchr(ns + 1, '"'))) { |