Merged revisions 307962 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Tue, 15 Feb 2011 19:53:32 +0000 (19:53 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 15 Feb 2011 19:53:32 +0000 (19:53 +0000)
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

apps/app_dial.c

index d0faa38..943ef30 100644 (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);
                }