shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 02:38:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

init: Free global init mutex in the destructor on Windows

Browse Source 
Fixes: #57 (T238)

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
(cherry picked from commit 163951d869)
This commit is contained in:
Anderson Toshiyuki Sasaki
2022-06-30 13:04:23 +02:00
committed by Jakub Jelen
parent 58a2943d42
commit 19c43ff6b7
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/init.c
View File

@@ -161,12 +161,14 @@ static int _ssh_finalize(unsigned destructor) {
if (_ssh_initialized > 1) { if (_ssh_initialized > 1) {
_ssh_initialized--; _ssh_initialized--;
goto _ret; ssh_mutex_unlock(&ssh_init_mutex);
return 0;
} }
if (_ssh_initialized == 1) { if (_ssh_initialized == 1) {
if (_ssh_init_ret < 0) { if (_ssh_init_ret < 0) {
goto _ret; ssh_mutex_unlock(&ssh_init_mutex);
return 0;
} }
} }
} }
@@ -181,10 +183,17 @@ static int _ssh_finalize(unsigned destructor) {
_ssh_initialized = 0; _ssh_initialized = 0;
_ret:
if (!destructor) { if (!destructor) {
ssh_mutex_unlock(&ssh_init_mutex); ssh_mutex_unlock(&ssh_init_mutex);
} }
#if (defined(_WIN32) && !defined(HAVE_PTHREAD))
if (ssh_init_mutex != NULL) {
DeleteCriticalSection(ssh_init_mutex);
SAFE_FREE(ssh_init_mutex);
}
#endif
return 0; return 0;
} }