Changeset 3596

Timestamp:

Jun 22, 2011 10:57:11 AM (13 years ago)

Author:

bennylp

Message:

Fixed #1316: Assertion when TURN session is deallocated prematurely (thanks Tony Jago Million for the report)

Location:

pjproject/branches/1.x/pjnath/src/pjnath

Files:

• ice_strans.c (modified) (1 diff)
• turn_sock.c (modified) (1 diff)

pjproject/branches/1.x/pjnath/src/pjnath/ice_strans.c

@@ -1185 +1185 @@
             };
 
+            /* https://trac.pjsip.org/repos/ticket/1316 */
+            if (comp->turn_sock == NULL) {
+                /* TURN socket error */
+                return PJ_EINVALIDOP;
+            }
+
             if (!comp->turn_log_off) {
                 /* Disable logging for Send/Data indications */

pjproject/branches/1.x/pjnath/src/pjnath/turn_sock.c

@@ -620 +620 @@
     if (turn_sock == NULL) {
         /* We've been destroyed */
-        pj_assert(!"We should shutdown gracefully");
+        // https://trac.pjsip.org/repos/ticket/1316
+        //pj_assert(!"We should shutdown gracefully");
         return PJ_EINVALIDOP;
     }