[svn-commits] tilghman: trunk r240129 - /trunk/main/pbx.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Jan 14 10:52:22 2010
New Revision: 240129

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=240129
Log:
Ensure that the callerid is NULL when the parent is effectively NULL.
This applies only to pattern-match hints, which create exact-match
hints on the fly.

Modified:
    trunk/main/pbx.c

Modified: trunk/main/pbx.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/pbx.c?view=diff&rev=240129&r1=240128&r2=240129
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Thu Jan 14 10:52:22 2010
@@ -4302,7 +4302,7 @@
 	 */
 	if (e->exten[0] == '_') {
 		ast_add_extension(e->parent->name, 0, exten, e->priority, e->label,
-			e->cidmatch, e->app, ast_strdup(e->data), ast_free_ptr,
+			e->matchcid ? e->cidmatch : NULL, e->app, ast_strdup(e->data), ast_free_ptr,
 			e->registrar);
 		e = ast_hint_extension(NULL, context, exten);
 		if (!e || e->exten[0] == '_') {