summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Vossel <dvossel@digium.com>2011-02-07 16:33:43 +0000
committerDavid Vossel <dvossel@digium.com>2011-02-07 16:33:43 +0000
commit2db3c9e058dadf82e0577e5a2977b7febbb20539 (patch)
treeb6cd296774785dbfcd6c2f6a5282566ff435896c
parent7f86bd2f167943099dbe50ee2d12b04d9235c8d4 (diff)
Fixes use of ast_format_cap_append where ast_format_cap_copy is necessary.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@306541 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--channels/chan_sip.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f9cd26a23..a741520c6 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4887,7 +4887,7 @@ static int create_addr_from_peer(struct sip_pvt *dialog, struct sip_peer *peer)
ast_copy_flags(&dialog->flags[0], &peer->flags[0], SIP_FLAGS_TO_COPY);
ast_copy_flags(&dialog->flags[1], &peer->flags[1], SIP_PAGE2_FLAGS_TO_COPY);
ast_copy_flags(&dialog->flags[2], &peer->flags[2], SIP_PAGE3_FLAGS_TO_COPY);
- ast_format_cap_append(dialog->caps, peer->caps);
+ ast_format_cap_copy(dialog->caps, peer->caps);
dialog->prefs = peer->prefs;
if (ast_test_flag(&dialog->flags[1], SIP_PAGE2_T38SUPPORT)) {
/* t38pt_udptl was enabled in the peer and not in [general] */
@@ -7273,7 +7273,7 @@ struct sip_pvt *sip_alloc(ast_string_field callid, struct ast_sockaddr *addr,
/* Assign default music on hold class */
ast_string_field_set(p, mohinterpret, default_mohinterpret);
ast_string_field_set(p, mohsuggest, default_mohsuggest);
- ast_format_cap_append(p->caps, sip_cfg.caps);
+ ast_format_cap_copy(p->caps, sip_cfg.caps);
p->allowtransfer = sip_cfg.allowtransfer;
if ((ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_RFC2833) ||
(ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO))