mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 03:04:19 +00:00
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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67067 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -511,7 +511,7 @@ static void do_forward(struct chanlist *o,
|
||||
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 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
|
||||
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;
|
||||
|
||||
Reference in New Issue
Block a user