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

Properly fixed possible realloc with size zero problem.

Browse Source
This commit is contained in:
irungentoo 2013-08-18 10:27:03 -04:00
parent 558a80f1c3
commit 88ea4659e9
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Messenger.c
View File

@ -37,11 +37,15 @@ static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_i
return -1 if realloc fails */ return -1 if realloc fails */
int realloc_friendlist(Messenger *m, uint32_t num) int realloc_friendlist(Messenger *m, uint32_t num)
{ {
if (num * sizeof(Friend) == 0) return -1; if (num == 0) {
free(m->friendlist);
m->friendlist = NULL;
return 0;
}
Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend)); Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend));
if (newfriendlist == NULL && num != 0) if (newfriendlist == NULL)
return -1; return -1;
m->friendlist = newfriendlist; m->friendlist = newfriendlist;

8
core/net_crypto.c
View File

@ -406,11 +406,15 @@ static int getcryptconnection_id(uint8_t *public_key)
return -1 if realloc fails */ return -1 if realloc fails */
int realloc_cryptoconnection(uint32_t num) int realloc_cryptoconnection(uint32_t num)
{ {
if (num * sizeof(Crypto_Connection) == 0) return -1; if (num == 0) {
free(crypto_connections);
crypto_connections = NULL;
return 0;
}
Crypto_Connection *newcrypto_connections = realloc(crypto_connections, num * sizeof(Crypto_Connection)); Crypto_Connection *newcrypto_connections = realloc(crypto_connections, num * sizeof(Crypto_Connection));
if (newcrypto_connections == NULL && num != 0) if (newcrypto_connections == NULL)
return -1; return -1;
crypto_connections = newcrypto_connections; crypto_connections = newcrypto_connections;