Changeset 5671

Timestamp:

Oct 6, 2017 6:54:37 AM (7 years ago)

Author:

riza

Message:

Re #2045(misc): To prevent assertion, don't copy rem_rtcp on pjmedia_stream_create()/pjmedia_vid_stream_create() if address is not set.
Thanks to Lauri Vanksa for the Report.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• stream.c (modified) (1 diff)
• vid_stream.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -2349 +2349 @@
 
     stream->out_rtcp_pkt = pj_pool_alloc(pool, stream->out_rtcp_pkt_size);
+    pj_bzero(&att_param, sizeof(att_param));
     att_param.stream = stream;
     att_param.media_type = PJMEDIA_TYPE_AUDIO;
     att_param.user_data = stream;
     pj_sockaddr_cp(&att_param.rem_addr, &info->rem_addr);
-    pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
+    if (pj_sockaddr_has_addr(&info->rem_rtcp.addr))
+        pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
     att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);
     att_param.rtp_cb = &on_rx_rtp;

pjproject/trunk/pjmedia/src/pjmedia/vid_stream.c

@@ -1666 +1666 @@
 
     stream->out_rtcp_pkt = pj_pool_alloc(pool, stream->out_rtcp_pkt_size);
+    pj_bzero(&att_param, sizeof(att_param));
     att_param.stream = stream;
     att_param.media_type = PJMEDIA_TYPE_VIDEO;
     att_param.user_data = stream;
     pj_sockaddr_cp(&att_param.rem_addr, &info->rem_addr);
-    pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
+    if (pj_sockaddr_has_addr(&info->rem_rtcp.addr))
+        pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);    
     att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);
     att_param.rtp_cb = &on_rx_rtp;