summaryrefslogtreecommitdiff
path: root/core/Messenger.c
diff options
context:
space:
mode:
Diffstat (limited to 'core/Messenger.c')
-rw-r--r--core/Messenger.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/Messenger.c b/core/Messenger.c
index c7759cf1..051078f9 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -37,8 +37,9 @@ static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_i
37 return -1 if realloc fails */ 37 return -1 if realloc fails */
38int realloc_friendlist(Messenger *m, uint32_t num) 38int realloc_friendlist(Messenger *m, uint32_t num)
39{ 39{
40 if (num * sizeof(Friend) == 0) return -1;
41
40 Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend)); 42 Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend));
41
42 if (newfriendlist == NULL && num != 0) 43 if (newfriendlist == NULL && num != 0)
43 return -1; 44 return -1;
44 45
@@ -597,7 +598,6 @@ int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint
597 598
598/*Interval in seconds between LAN discovery packet sending*/ 599/*Interval in seconds between LAN discovery packet sending*/
599#define LAN_DISCOVERY_INTERVAL 60 600#define LAN_DISCOVERY_INTERVAL 60
600
601#define PORT 33445 601#define PORT 33445
602 602
603/*Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds*/ 603/*Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds*/
@@ -971,4 +971,3 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
971 971
972 return 0; 972 return 0;
973} 973}
974