Changeset 2753 for pjproject

Timestamp:

Jun 5, 2009 3:55:28 PM (15 years ago)

Author:

bennylp

Message:

Ticket #844: Assertion in on_rx_rtp(transport_udp.c) possibly due to race condition (thanks Peter Cai and Michael Broughton for the report)

File:

• pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c (modified) (2 diffs)

pjproject/trunk/pjmedia/src/pjmedia/transport_udp.c

@@ -638 +638 @@
     PJ_ASSERT_RETURN(!udp->attached, PJ_EINVALIDOP);
 
+    /* Lock the ioqueue keys to make sure that callbacks are
+     * not executed. See ticket #844 for details.
+     */
+    pj_ioqueue_lock_key(udp->rtp_key);
+    pj_ioqueue_lock_key(udp->rtcp_key);
+
     /* "Attach" the application: */
 
@@ -672 +678 @@
     pj_bzero(&udp->rtcp_src_addr, sizeof(udp->rtcp_src_addr));
     udp->rtp_src_cnt = 0;
+
+    /* Unlock keys */
+    pj_ioqueue_unlock_key(udp->rtcp_key);
+    pj_ioqueue_unlock_key(udp->rtp_key);
 
     return PJ_SUCCESS;