2 files changed, 5 insertions, 3 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 2b5c8241..8a5d9ed4 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -37,6 +37,8 @@ static int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_i
    return -1 if realloc fails */
 int realloc_friendlist(Messenger *m, uint32_t num)
 {
+    if (num * sizeof(Friend) == 0) return -1;
+
     Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend));
 
     if (newfriendlist == NULL && num != 0)
@@ -597,7 +599,6 @@ int write_cryptpacket_id(Messenger *m, int friendnumber, uint8_t packet_id, uint
 
 /*Interval in seconds between LAN discovery packet sending*/
 #define LAN_DISCOVERY_INTERVAL 60
-
 #define PORT 33445
 
 /*Send a LAN discovery packet every LAN_DISCOVERY_INTERVAL seconds*/
@@ -951,6 +952,7 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
         }
     }
 
+    free(temp);
     data += size;
     length -= size;
 
@@ -968,7 +970,5 @@ int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
 
     setname(m, data, small_size);
 
-    free(temp);
     return 0;
 }
-
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 7fdd035f..6ced942b 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -406,6 +406,8 @@ static int getcryptconnection_id(uint8_t *public_key)
    return -1 if realloc fails */
 int realloc_cryptoconnection(uint32_t num)
 {
+    if (num * sizeof(Crypto_Connection) == 0) return -1;
+
     Crypto_Connection *newcrypto_connections = realloc(crypto_connections, num * sizeof(Crypto_Connection));
 
     if (newcrypto_connections == NULL && num != 0)