[asterisk-commits] file: trunk r423174 - in /trunk: ./ res/res_pjsip_session.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Sep 16 07:12:36 2014
New Revision: 423174

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=423174
Log:
res_pjsip_session: Fix usage of wrong memory pool when creating local SDP.
........

Merged revisions 423172 from http://svn.asterisk.org/svn/asterisk/branches/12
........

Merged revisions 423173 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_session.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_session.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_session.c?view=diff&rev=423174&r1=423173&r2=423174
==============================================================================
--- trunk/res/res_pjsip_session.c (original)
+++ trunk/res/res_pjsip_session.c Tue Sep 16 07:12:36 2014
@@ -2097,8 +2097,8 @@
 		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);
@@ -2118,14 +2118,14 @@
 		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);
 		}
 	}