Merge with upstream

1 files changed, 6 insertions, 0 deletions

diff --git a/core/DHT.c b/core/DHT.c
index 55f34994..924e3216 100644
--- a/core/DHT.c
+++ b/core/DHT.c
@@ -704,6 +704,12 @@ int DHT_delfriend(uint8_t *client_id)
                         CLIENT_ID_SIZE );
             }
 
+            if (num_friends == 0) {
+                free(friends_list);
+                friends_list = NULL;
+                return 0;
+            }
+
             temp = realloc(friends_list, sizeof(Friend) * (num_friends));
 
             if (temp == NULL)