From 9deb515ffa13c853cc7933e0597cae95637605eb Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Tue, 5 May 2020 01:42:58 +0300
Subject: [PATCH] Fixed two UB-matter segfaults
---
dap-sdk/core/src/dap_common.c | 2 +-
dap-sdk/net/client/dap_client.c | 1 +
dap-sdk/net/core/dap_traffic_track.c | 2 --
modules/global-db/dap_chain_global_db_driver.c | 2 +-
modules/global-db/dap_chain_global_db_hist.c | 3 +--
modules/net/dap_chain_node_cli_cmd.c | 2 ++
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dap-sdk/core/src/dap_common.c b/dap-sdk/core/src/dap_common.c
index cfbd527149..78b63ee843 100755
--- a/dap-sdk/core/src/dap_common.c
+++ b/dap-sdk/core/src/dap_common.c
@@ -320,7 +320,7 @@ static void *s_log_thread_proc(void *arg) {
}
pthread_mutex_unlock(&s_log_mutex);
}
- pthread_exit(NULL);
+ return NULL;
}
/**
diff --git a/dap-sdk/net/client/dap_client.c b/dap-sdk/net/client/dap_client.c
index 14ed72dff2..b9d5506239 100644
--- a/dap-sdk/net/client/dap_client.c
+++ b/dap-sdk/net/client/dap_client.c
@@ -208,6 +208,7 @@ void dap_client_delete(dap_client_t * a_client)
// a_client will be deleted in dap_events_socket_delete() -> free( a_es->_inheritor );
//DAP_DELETE(a_client);
DAP_DELETE(a_client);
+ a_client = NULL;
}
/**
diff --git a/dap-sdk/net/core/dap_traffic_track.c b/dap-sdk/net/core/dap_traffic_track.c
index ad9c6c661d..44c7506a6c 100644
--- a/dap-sdk/net/core/dap_traffic_track.c
+++ b/dap-sdk/net/core/dap_traffic_track.c
@@ -97,8 +97,6 @@ void *_worker_run( void *a )
}
pthread_mutex_unlock( &_mutex );
- pthread_exit( NULL );
-
return NULL;
}
diff --git a/modules/global-db/dap_chain_global_db_driver.c b/modules/global-db/dap_chain_global_db_driver.c
index 775bf47fda..b1e8058310 100644
--- a/modules/global-db/dap_chain_global_db_driver.c
+++ b/modules/global-db/dap_chain_global_db_driver.c
@@ -461,7 +461,7 @@ static void* func_write_buf(void * arg)
wait_data(&s_mutex_cond, &s_cond_add_end, 2000); // 2 sec
}
}
- pthread_exit(0);
+ return NULL;
}
#endif //USE_WRITE_BUFFER
diff --git a/modules/global-db/dap_chain_global_db_hist.c b/modules/global-db/dap_chain_global_db_hist.c
index 1f63e6839d..b0d510b689 100644
--- a/modules/global-db/dap_chain_global_db_hist.c
+++ b/modules/global-db/dap_chain_global_db_hist.c
@@ -1311,8 +1311,7 @@ static void *s_list_thread_proc(void *arg)
pthread_mutex_lock(&l_dap_db_log_list->list_mutex);
l_dap_db_log_list->is_process = false;
pthread_mutex_unlock(&l_dap_db_log_list->list_mutex);
- pthread_exit(0);
- return 0;
+ return NULL;
}
/**
diff --git a/modules/net/dap_chain_node_cli_cmd.c b/modules/net/dap_chain_node_cli_cmd.c
index 52e6d728d8..cff20b4b19 100644
--- a/modules/net/dap_chain_node_cli_cmd.c
+++ b/modules/net/dap_chain_node_cli_cmd.c
@@ -73,7 +73,9 @@
#include "dap_chain_node_cli_cmd_tx.h"
#include "dap_chain_node_ping.h"
#include "dap_chain_net_srv.h"
+#ifndef _WIN32
#include "dap_chain_net_vpn_client.h"
+#endif
#include "dap_chain_cell.h"
#include "dap_chain_common.h"
--
GitLab