Changeset 4207 for pjproject/trunk

Timestamp:

Jul 17, 2012 12:45:39 PM (12 years ago)

Author:

ming

Message:

Fixed #1577: assertion when TURN session is already destroyed

File:

• pjproject/trunk/pjnath/src/pjnath/turn_sock.c (modified) (2 diffs)

pjproject/trunk/pjnath/src/pjnath/turn_sock.c

@@ -212 +212 @@
 
     if (turn_sock->active_sock) {
+        pj_activesock_set_user_data(turn_sock->active_sock, NULL);
         pj_activesock_close(turn_sock->active_sock);
         turn_sock->active_sock = NULL;
@@ -464 +465 @@
 
     turn_sock = (pj_turn_sock*) pj_activesock_get_user_data(asock);
+    if (!turn_sock)
+        return PJ_FALSE;
+
+    /* TURN session may have already been destroyed here.
+     * See ticket #1557 (http://trac.pjsip.org/repos/ticket/1557).
+     */
+    if (!turn_sock->sess) {
+        sess_fail(turn_sock, "TURN session already destroyed", status);
+        return PJ_FALSE;
+    }
 
     if (status != PJ_SUCCESS) {