Merge pull request #584 from FullName/MessengerLoadSave

Tests of state loading/saving lead to two fixes for DHT.c and util.c

1 files changed, 6 insertions, 8 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index ddd1e1e0..f38ce3a5 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -1576,18 +1576,16 @@ void DHT_save(DHT *dht, uint8_t *data)
         if (dht->close_clientlist[i].timestamp != 0)
             num++;
 
-    if (!num)
-        return;
-
     len = num * sizeof(Client_data);
     type = DHT_STATE_TYPE_CLIENTS;
     data = z_state_save_subheader(data, len, type);
-    Client_data *clients = (Client_data *)data;
-
-    for (num = 0, i = 0; i < LCLIENT_LIST; ++i)
-        if (dht->close_clientlist[i].timestamp != 0)
-            memcpy(&clients[num++], &dht->close_clientlist[i], sizeof(Client_data));
+    if (num) {
+        Client_data *clients = (Client_data *)data;
 
+        for (num = 0, i = 0; i < LCLIENT_LIST; ++i)
+            if (dht->close_clientlist[i].timestamp != 0)
+                memcpy(&clients[num++], &dht->close_clientlist[i], sizeof(Client_data));
+    }
     data += len;
 }