Changeset 5901

Timestamp:

Nov 2, 2018 6:45:58 AM (6 years ago)

Author:

nanang

Message:

Misc (re #2147): Assertion in pj_sockaddr_cp() when pjmedia_transport_attach() is called with rem_rtcp zero initialized (thanks Lauri Vänskä for the report).

File:

• pjproject/trunk/pjmedia/include/pjmedia/transport.h (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/transport.h

@@ -782 +782 @@
         param.user_data = user_data;
         pj_sockaddr_cp(&param.rem_addr, rem_addr);
-        pj_sockaddr_cp(&param.rem_rtcp, rem_rtcp);
+        if (rem_rtcp && pj_sockaddr_has_addr(rem_rtcp)) {
+            pj_sockaddr_cp(&param.rem_rtcp, rem_rtcp);
+        } else {
+            /* Copy RTCP address from the RTP address, with port + 1 */
+            pj_memcpy(&param.rem_rtcp, rem_addr, addr_len);
+            pj_sockaddr_set_port(&param.rem_rtcp,
+                                 pj_sockaddr_get_port(rem_addr) + 1);
+        }
         param.addr_len = addr_len;
         param.rtp_cb = rtp_cb;