diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-12 20:00:53 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-12 20:00:53 +0000 |
| commit | 5d9107fea891d0dcfd21e9febe1cba26091f4d5c (patch) | |
| tree | 6f57f463cadba2bcfa7578383357e9101dfdca4e /main | |
| parent | d53ddeacdeaa09a832ce19d4510374ad630fdd60 (diff) | |
Merged revisions 239571 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@239574 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 165c2b735..7d04c6203 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7141,7 +7141,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 { |