Properly fixed possible realloc with size zero problem.

1 files changed, 6 insertions, 2 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;