StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Added some checks to mutex related functions.

Browse Source
This commit is contained in:
irungentoo 2014-09-23 21:00:12 -04:00
parent da70ef899e
commit 744f51ec36
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
toxcore/net_crypto.c
View File

@ -1314,10 +1314,12 @@ static int create_crypto_connection(Net_Crypto *c)
int id = -1;
if (realloc_cryptoconnection(c, c->crypto_connections_length + 1) == 0) {
memset(&(c->crypto_connections[c->crypto_connections_length]), 0, sizeof(Crypto_Connection));
id = c->crypto_connections_length;
pthread_mutex_init(&c->crypto_connections[id].mutex, NULL);
++c->crypto_connections_length;
memset(&(c->crypto_connections[id]), 0, sizeof(Crypto_Connection));
if (pthread_mutex_init(&c->crypto_connections[id].mutex, NULL) != 0)
return -1;
}
pthread_mutex_unlock(&c->connections_mutex);
@ -2642,6 +2644,14 @@ Net_Crypto *new_net_crypto(DHT *dht, TCP_Proxy_Info *proxy_info)
if (temp == NULL)
return NULL;
pthread_mutexattr_t attr;
if (pthread_mutexattr_init(&attr) != 0 || pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0
|| pthread_mutex_init(&temp->tcp_mutex, &attr) != 0 || pthread_mutex_init(&temp->connections_mutex, NULL) != 0) {
free(temp);
return NULL;
}
temp->dht = dht;
new_keys(temp);
@ -2656,12 +2666,6 @@ Net_Crypto *new_net_crypto(DHT *dht, TCP_Proxy_Info *proxy_info)
bs_list_init(&temp->ip_port_list, sizeof(IP_Port), 8);
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
pthread_mutex_init(&temp->tcp_mutex, &attr);
pthread_mutex_init(&temp->connections_mutex, NULL);
if (proxy_info) {
temp->proxy_info = *proxy_info;
temp->proxy_set = 1;