[asterisk-commits] file: trunk r422748 - in /trunk: ./ res/res_pjsip_sdp_rtp.c

[SVN commits to the Asterisk project]

Author: file
Date: Sat Sep  6 14:13:10 2014
New Revision: 422748

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422748
Log:
res_pjsip_sdp_rtp: Fix retrieval of "ice-pwd" attribute if in session and not media stream.
........

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

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

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

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

Modified: trunk/res/res_pjsip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_sdp_rtp.c?view=diff&rev=422748&r1=422747&r2=422748
==============================================================================
--- trunk/res/res_pjsip_sdp_rtp.c (original)
+++ trunk/res/res_pjsip_sdp_rtp.c Sat Sep  6 14:13:10 2014
@@ -419,7 +419,7 @@
 
 	attr = pjmedia_sdp_media_find_attr2(remote_stream, "ice-pwd", NULL);
 	if (!attr) {
-		pjmedia_sdp_attr_find2(remote->attr_count, remote->attr, "ice-pwd", NULL);
+		attr = pjmedia_sdp_attr_find2(remote->attr_count, remote->attr, "ice-pwd", NULL);
 	}
 	if (attr) {
 		ast_copy_pj_str(attr_value, (pj_str_t*)&attr->value, sizeof(attr_value));