[svn-commits] file: trunk r67067 - in /trunk: ./ apps/app_dial.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon Jun  4 13:00:24 2007
New Revision: 67067

URL: http://svn.digium.com/view/asterisk?view=rev&rev=67067
Log:
Merged revisions 67066 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67066 | file | 2007-06-04 13:59:14 -0400 (Mon, 04 Jun 2007) | 2 lines

Initialize cidname variable to nothing since it may be used without having been touched. (issue #9661 reported by dimas)

........

Modified:
    trunk/   (props changed)
    trunk/apps/app_dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_dial.c?view=diff&rev=67067&r1=67066&r2=67067
==============================================================================
--- trunk/apps/app_dial.c (original)
+++ trunk/apps/app_dial.c Mon Jun  4 13:00:24 2007
@@ -511,7 +511,7 @@
 			senddialevent(in, c);
 			/* After calling, set callerid to extension */
 			if (!ast_test_flag(peerflags, OPT_ORIGINAL_CLID)) {
-				char cidname[AST_MAX_EXTENSION];
+				char cidname[AST_MAX_EXTENSION] = "";
 				ast_set_callerid(c, S_OR(in->macroexten, in->exten), get_cid_name(cidname, sizeof(cidname), in), NULL);
 			}
 			/* Hangup the original channel now, in case we needed it */
@@ -1192,7 +1192,7 @@
 	struct cause_args num = { chan, 0, 0, 0 };
 	int cause;
 	char numsubst[256];
-	char cidname[AST_MAX_EXTENSION];
+	char cidname[AST_MAX_EXTENSION] = "";
 
 	struct ast_bridge_config config;
 	unsigned int calldurationlimit = 0;