From a66032a14a4d85f45b2eeb2cfb17f84177551c24 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 4 Mar 2009 19:24:59 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@180195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/callerid.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/callerid.c b/main/callerid.c
index 603ac27225..89b9788819 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, '"'))) {
--
GitLab