Changeset 4344 for pjproject/trunk

Timestamp:

Feb 8, 2013 7:33:23 AM (12 years ago)

Author:

nanang

Message:

Re #1610: Workaround for crash in sess_on_send_msg() callback

File:

• pjproject/trunk/pjnath/src/pjnath/stun_sock.c (modified) (3 diffs)

pjproject/trunk/pjnath/src/pjnath/stun_sock.c

@@ -391 +391 @@
     }
 
+    if (stun_sock->stun_sess) {
+        pj_stun_session_set_user_data(stun_sock->stun_sess, NULL);
+    }
+    
     /* Destroy the active socket first just in case we'll get
      * stray callback.
      */
     if (stun_sock->active_sock != NULL) {
-        pj_activesock_set_user_data(stun_sock->active_sock, NULL);
-        pj_activesock_close(stun_sock->active_sock);
+        pj_activesock_t *asock = stun_sock->active_sock;
         stun_sock->active_sock = NULL;
         stun_sock->sock_fd = PJ_INVALID_SOCKET;
+        pj_activesock_set_user_data(asock, NULL);
+        pj_activesock_close(asock);
     } else if (stun_sock->sock_fd != PJ_INVALID_SOCKET) {
         pj_sock_close(stun_sock->sock_fd);
@@ -621 +626 @@
 
     stun_sock = (pj_stun_sock *) pj_stun_session_get_user_data(sess);
+    if (!stun_sock || !stun_sock->active_sock)
+        return PJ_EINVALIDOP;
 
     pj_assert(token==INTERNAL_MSG_TOKEN);
@@ -649 +656 @@
 
     stun_sock = (pj_stun_sock *) pj_stun_session_get_user_data(sess);
+    if (!stun_sock)
+        return;
 
     PJ_UNUSED_ARG(tdata);