check if nw_socket is open before trying to cancel/close

awslabs · Sep 24, 2024 · d4959a6 · d4959a6
1 parent bfd662e
commit d4959a6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/include/aws/io/private/pki_utils.h b/include/aws/io/private/pki_utils.h
@@ -14,11 +14,11 @@
 
 #ifdef AWS_OS_APPLE
 /* It's ok to include external headers because this is a PRIVATE header file */
-#    include <CoreFoundation/CFArray.h>
+#include <CoreFoundation/CFArray.h>
 #include <Security/Security.h>
-struct aws_secitem_options;
 #endif /* AWS_OS_APPLE */
 
+struct aws_secitem_options;
 struct aws_string;
 
 AWS_EXTERN_C_BEGIN

diff --git a/source/darwin/nw_socket.c b/source/darwin/nw_socket.c
@@ -1016,11 +1016,13 @@ static int s_socket_close_fn(struct aws_socket *socket) {
     if (nw_socket->is_listener) {
         nw_listener_set_state_changed_handler(socket->io_handle.data.handle, NULL);
         nw_listener_cancel(socket->io_handle.data.handle);
-
     } else {
+        if (nw_socket->socket_open) {
+            nw_connection_cancel(socket->io_handle.data.handle);
+        }
+
         /* Setting to NULL removes previously set handler from nw_connection_t */
         nw_connection_set_state_changed_handler(socket->io_handle.data.handle, NULL);
-        nw_connection_cancel(socket->io_handle.data.handle);
     }
     nw_socket->socket_open = false;
 
@@ -1331,7 +1333,6 @@ static int s_socket_get_error_fn(struct aws_socket *socket) {
 
 static bool s_socket_is_open_fn(struct aws_socket *socket) {
     struct nw_socket *nw_socket = socket->impl;
-
     if (!socket->io_handle.data.handle) {
         return false;
     }