Changeset 5680 for pjproject/trunk/pjlib/src/pj/activesock.c

Timestamp:

Nov 3, 2017 6:54:54 AM (7 years ago)

Author:

nanang

Message:

Fix #2055:

• Updated active socket to avoid double ioqueue key unregistration.
• Updated ioqueue to avoid double ioq key unregistration (select & epoll only, winnt & uwp does not seem to be affected).
• Added check for potential 'negative' ioqueue->count.

File:

• pjproject/trunk/pjlib/src/pj/activesock.c (modified) (2 diffs)

pjproject/trunk/pjlib/src/pj/activesock.c

@@ -297 +297 @@
 PJ_DEF(pj_status_t) pj_activesock_close(pj_activesock_t *asock)
 {
+    pj_ioqueue_key_t *key;
+    pj_bool_t unregister = PJ_FALSE;
+
     PJ_ASSERT_RETURN(asock, PJ_EINVAL);
     asock->shutdown = SHUT_RX | SHUT_TX;
-    if (asock->key) {
-        pj_ioqueue_unregister(asock->key);
+
+    /* Avoid double unregistration on the key */
+    key = asock->key;
+    if (key) {
+        pj_ioqueue_lock_key(key);
+        unregister = (asock->key != NULL);
+        asock->key = NULL;
+        pj_ioqueue_unlock_key(key);
+    }
+
+    if (unregister) {
+        pj_ioqueue_unregister(key);
 
 #if defined(PJ_IPHONE_OS_HAS_MULTITASKING_SUPPORT) && \
@@ -306 +319 @@
         activesock_destroy_iphone_os_stream(asock);
 #endif  
-
-        asock->key = NULL;
     }
     return PJ_SUCCESS;