[asterisk-commits] tilghman: branch 1.6.0 r239573 - in /branches/1.6.0: ./ main/pbx.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jan 12 13:59:23 2010
New Revision: 239573

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=239573
Log:
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)
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/pbx.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/pbx.c?view=diff&rev=239573&r1=239572&r2=239573
==============================================================================
--- branches/1.6.0/main/pbx.c (original)
+++ branches/1.6.0/main/pbx.c Tue Jan 12 13:59:23 2010
@@ -6841,7 +6841,9 @@
 	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 {