kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 307962 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r307962 | rmudgett | 2011-02-15 13:52:45 -0600 (Tue, 15 Feb 2011) | 1 line
  
  Don't crash when forcing caller id.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@307963 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2011-02-15 19:53:32 +00:00
parent 64ed1ba3e9
commit b1db966684
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/app_dial.c
View File

@@ -2115,7 +2115,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
struct ast_party_connected_line connected;
int pres;
ast_party_connected_line_set_init(&connected, &tmp->chan->connected);
ast_party_connected_line_set_init(&connected, &tc->connected);
if (cid_pres) {
pres = ast_parse_caller_presentation(cid_pres);
if (pres < 0) {
@@ -2135,7 +2135,7 @@ static int dial_exec_full(struct ast_channel *chan, const char *data, struct ast
connected.id.name.presentation = pres;
}
connected.id.tag = cid_tag;
ast_channel_set_connected_line(tmp->chan, &connected, NULL);
ast_channel_set_connected_line(tc, &connected, NULL);
} else {
ast_connected_line_copy_from_caller(&tc->connected, &chan->caller);
}