Changeset 5439 for pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp

Timestamp:

Sep 26, 2016 7:57:54 AM (8 years ago)

Author:

nanang

Message:

Re #1900: Fixed crash in destroying UDP socket after being initialized but not used (for sending/receiving).

File:

• pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp (modified) (2 diffs)

pjproject/branches/projects/uwp/pjlib/src/pj/sock_uwp.cpp

@@ -389 +389 @@
         concurrency::create_task(stream_sock->CancelIOAsync()).wait();
     }
-    if (datagram_sock) {
+    if (datagram_sock && has_pending_send) {
         concurrency::create_task(datagram_sock->CancelIOAsync()).wait();
     }
@@ -440 +440 @@
         int port;
 
-        try {
-            sockaddr_to_hostname_port(addr, host, &port);
-            if (pj_sockaddr_has_addr(addr)) {
-                if (sock_type == SOCKTYPE_DATAGRAM)
-                    return datagram_sock->BindEndpointAsync(host, port.ToString());
-                else
-                    return listener_sock->BindEndpointAsync(host, port.ToString());
-            } else /* if (pj_sockaddr_get_port(addr) != 0) */ {
-                if (sock_type == SOCKTYPE_DATAGRAM)
-                    return datagram_sock->BindServiceNameAsync(port.ToString());
-                else
-                    return listener_sock->BindServiceNameAsync(port.ToString());
-            }
-        } catch (Exception^ e) {
-            err = e->HResult;
+        sockaddr_to_hostname_port(addr, host, &port);
+        if (pj_sockaddr_has_addr(addr)) {
+            if (sock_type == SOCKTYPE_DATAGRAM)
+                return datagram_sock->BindEndpointAsync(host, port.ToString());
+            else
+                return listener_sock->BindEndpointAsync(host, port.ToString());
+        } else /* if (pj_sockaddr_get_port(addr) != 0) */ {
+            if (sock_type == SOCKTYPE_DATAGRAM)
+                return datagram_sock->BindServiceNameAsync(port.ToString());
+            else
+                return listener_sock->BindServiceNameAsync(port.ToString());
         }
     }).then([this, &err](concurrency::task<void> t)