Changeset 4400 for pjproject/branches/1.x

Timestamp:

Feb 27, 2013 2:31:05 PM (12 years ago)

Author:

riza

Message:

Re #1610: backported to 1.x

Location:

pjproject/branches/1.x

Files:

• . (modified) (1 prop)
• pjnath/src/pjnath/stun_sock.c (modified) (5 diffs)

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

@@ -387 +387 @@
     }
 
+    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_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);
@@ -616 +622 @@
 
     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);
@@ -644 +652 @@
 
     stun_sock = (pj_stun_sock *) pj_stun_session_get_user_data(sess);
+    if (!stun_sock)
+        return;
 
     PJ_UNUSED_ARG(tdata);
@@ -766 +776 @@
 
     stun_sock = (pj_stun_sock*) pj_activesock_get_user_data(asock);
+    if (!stun_sock)
+        return PJ_FALSE;
 
     /* Log socket error */
@@ -830 +842 @@
 
     stun_sock = (pj_stun_sock*) pj_activesock_get_user_data(asock);
+    if (!stun_sock)
+        return PJ_FALSE;
 
     /* Don't report to callback if this is internal message */