From: Joshua Colp Date: Tue, 16 Sep 2014 12:11:09 +0000 (+0000) Subject: res_pjsip_session: Fix usage of wrong memory pool when creating local SDP. X-Git-Tag: 12.6.0-rc1~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2edc9c1d6483b87bcaa72c9c9d5b535895ef216;p=thirdparty%2Fasterisk.git res_pjsip_session: Fix usage of wrong memory pool when creating local SDP. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@423172 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c index baef4a11b1..28d52dd743 100644 --- a/res/res_pjsip_session.c +++ b/res/res_pjsip_session.c @@ -2087,8 +2087,8 @@ static struct pjmedia_sdp_session *create_local_sdp(pjsip_inv_session *inv, stru local->origin.id = offer->origin.id; } - pj_strdup2(inv->pool, &local->origin.user, session->endpoint->media.sdpowner); - pj_strdup2(inv->pool, &local->name, session->endpoint->media.sdpsession); + pj_strdup2(inv->pool_prov, &local->origin.user, session->endpoint->media.sdpowner); + pj_strdup2(inv->pool_prov, &local->name, session->endpoint->media.sdpsession); /* Now let the handlers add streams of various types, pjmedia will automatically reorder the media streams for us */ successful = ao2_callback_data(session->media, OBJ_MULTIPLE, add_sdp_streams, local, session); @@ -2108,14 +2108,14 @@ static struct pjmedia_sdp_session *create_local_sdp(pjsip_inv_session *inv, stru local->origin.addr_type = session->endpoint->media.rtp.ipv6 ? STR_IP6 : STR_IP4; if (!ast_strlen_zero(session->endpoint->media.address)) { - pj_strdup2(inv->pool, &local->origin.addr, session->endpoint->media.address); + pj_strdup2(inv->pool_prov, &local->origin.addr, session->endpoint->media.address); } else { pj_sockaddr localaddr; char our_ip[PJ_INET6_ADDRSTRLEN]; pj_gethostip(session->endpoint->media.rtp.ipv6 ? pj_AF_INET6() : pj_AF_INET(), &localaddr); pj_sockaddr_print(&localaddr, our_ip, sizeof(our_ip), 0); - pj_strdup2(inv->pool, &local->origin.addr, our_ip); + pj_strdup2(inv->pool_prov, &local->origin.addr, our_ip); } }