2 files changed, 12 insertions, 4 deletions

diff --git a/core/Messenger.c b/core/Messenger.c
index 8a5d9ed4..66ae4f41 100644
--- a/core/Messenger.c
+++ b/core/Messenger.c
@@ -37,11 +37,15 @@ 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;
+    if (num == 0) {
+        free(m->friendlist);
+        m->friendlist = NULL;
+        return 0;
+    }
 
     Friend *newfriendlist = realloc(m->friendlist, num * sizeof(Friend));
 
-    if (newfriendlist == NULL && num != 0)
+    if (newfriendlist == NULL)
         return -1;
 
     m->friendlist = newfriendlist;
diff --git a/core/net_crypto.c b/core/net_crypto.c
index 6ced942b..a9af3430 100644
--- a/core/net_crypto.c
+++ b/core/net_crypto.c
@@ -406,11 +406,15 @@ 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;
+    if (num == 0) {
+        free(crypto_connections);
+        crypto_connections = NULL;
+        return 0;
+    }
 
     Crypto_Connection *newcrypto_connections = realloc(crypto_connections, num * sizeof(Crypto_Connection));
 
-    if (newcrypto_connections == NULL && num != 0)
+    if (newcrypto_connections == NULL)
         return -1;
 
     crypto_connections = newcrypto_connections;