[SCM] Socket Wrapper Repository - branch master updated

Andreas Schneider asn at samba.org
Mon Oct 29 19:31:57 UTC 2018


The branch, master has been updated
       via  32df6eb swrap: Fix coverity issues
      from  c26835a gitlab-ci: Disable the FreeBSD runner

https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 32df6eb3c0d6ef19f561ff65e444b3ce3dff5a9e
Author: Anoop C S <anoopcs at redhat.com>
Date:   Fri Oct 26 15:44:53 2018 +0530

    swrap: Fix coverity issues
    
    CID 184220
    CID 184221
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 src/socket_wrapper.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 0f19b95..5e3a47b 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -2055,8 +2055,6 @@ static void swrap_remove_stale(int fd)
 
 	reset_socket_info_index(fd);
 
-	swrap_mutex_unlock(&socket_reset_mutex);
-
 	si = swrap_get_socket_info(si_index);
 
 	swrap_mutex_lock(&first_free_mutex);
@@ -2078,6 +2076,7 @@ static void swrap_remove_stale(int fd)
 out:
 	SWRAP_UNLOCK_SI(si);
 	swrap_mutex_unlock(&first_free_mutex);
+	swrap_mutex_unlock(&socket_reset_mutex);
 }
 
 static int sockaddr_convert_to_un(struct socket_info *si,
@@ -5935,8 +5934,6 @@ static int swrap_close(int fd)
 
 	reset_socket_info_index(fd);
 
-	swrap_mutex_unlock(&socket_reset_mutex);
-
 	si = swrap_get_socket_info(si_index);
 
 	swrap_mutex_lock(&first_free_mutex);
@@ -5970,6 +5967,7 @@ static int swrap_close(int fd)
 out:
 	SWRAP_UNLOCK_SI(si);
 	swrap_mutex_unlock(&first_free_mutex);
+	swrap_mutex_unlock(&socket_reset_mutex);
 
 	return ret;
 }


-- 
Socket Wrapper Repository



More information about the samba-cvs mailing list