kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 239571 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r239571 | tilghman | 2010-01-12 13:58:00 -0600 (Tue, 12 Jan 2010) | 5 lines
  
  Blank callerid and NULL callerid should not compare equal.
  The second is the default state for matching CID in the dialplan (no matching)
  while the first matches one particular CallerID.  This is a regression.
  (fixes AST-314, SWP-611)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@239573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-01-12 19:59:23 +00:00
parent 167d5c57fe
commit c00e8397c3
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/pbx.c
View File

@@ -6841,7 +6841,9 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
p += ext_strncpy(p, extension, strlen(extension) + 1) + 1;
tmp->priority = priority;
tmp->cidmatch = p; /* but use p for assignments below */
if (!ast_strlen_zero(callerid)) {
/* Blank callerid and NULL callerid are two SEPARATE things. Do NOT confuse the two!!! */
if (callerid) {
p += ext_strncpy(p, callerid, strlen(callerid) + 1) + 1;
tmp->matchcid = 1;
} else {