Changeset 1790 for pjproject/trunk/pjmedia/src/pjmedia/stream.c

Timestamp:

Feb 13, 2008 4:59:29 PM (16 years ago)

Author:

bennylp

Message:

Ticket #460: Concurrency problem when destroying stream (thanks Michael Broughton)

File:

• pjproject/trunk/pjmedia/src/pjmedia/stream.c (modified) (1 diff)

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

@@ -1400 +1400 @@
 
 
+    /* Detach from transport 
+     * MUST NOT hold stream mutex while detaching from transport, as
+     * it may cause deadlock. See ticket #460 for the details.
+     */
+    if (stream->transport) {
+        pjmedia_transport_detach(stream->transport, stream);
+        stream->transport = NULL;
+    }
+
     /* This function may be called when stream is partly initialized. */
     if (stream->jb_mutex)
         pj_mutex_lock(stream->jb_mutex);
 
-
-    /* Detach from transport */
-    if (stream->transport) {
-        (*stream->transport->op->detach)(stream->transport, stream);
-        stream->transport = NULL;
-    }
 
     /* Free codec. */