4 files changed, 27 insertions, 36 deletions

diff --git a/toxcore/DHT.c b/toxcore/DHT.c
index 0b866940..fcd15686 100644
--- a/toxcore/DHT.c
+++ b/toxcore/DHT.c
@@ -1304,8 +1304,6 @@ int DHT_load_old(DHT *dht, uint8_t *data, uint32_t size)
 #define DHT_STATE_TYPE_FRIENDS     1
 #define DHT_STATE_TYPE_CLIENTS     2
 
-typedef uint16_t statelensub_t;
-
 /* Get the size of the DHT (for saving). */
 uint32_t DHT_size(DHT *dht)
 {
@@ -1314,26 +1312,25 @@ uint32_t DHT_size(DHT *dht)
         if (dht->close_clientlist[i].timestamp != 0)
             num++;
 
-    uint32_t size32 = sizeof(uint32_t), lengthsublen = sizeof(statelensub_t);
-    uint32_t sizesubhead = lengthsublen + size32;
+    uint32_t size32 = sizeof(uint32_t), sizesubhead = size32 * 2;
     return size32
          + sizesubhead + sizeof(DHT_Friend) * dht->num_friends
          + sizesubhead + sizeof(Client_data) * num;
 }
 
-static uint8_t *z_state_save_subheader(uint8_t *data, statelensub_t len, uint16_t type)
+static uint8_t *z_state_save_subheader(uint8_t *data, uint32_t len, uint16_t type)
 {
-    *(statelensub_t *)data = len;
-    data += sizeof(statelensub_t);
-    *(uint32_t *)data = (DHT_STATE_COOKIE_TYPE << 16) | type;
-    data += sizeof(uint32_t);
+    uint32_t *data32 = (uint32_t *)data;
+    data32[0] = len;
+    data32[1] = (DHT_STATE_COOKIE_TYPE << 16) | type;
+    data += sizeof(uint32_t) * 2;
     return data;
 }
 
 /* Save the DHT in data where data is an array of size DHT_size(). */
 void DHT_save(DHT *dht, uint8_t *data)
 {
-    statelensub_t len;
+    uint32_t len;
     uint16_t type;
     *(uint32_t *)data = DHT_STATE_COOKIE_GLOBAL;
     data += sizeof(uint32_t);
diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 682cb1be..2fbb1d3f 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1361,13 +1361,10 @@ static int Messenger_load_old(Messenger *m, uint8_t *data, uint32_t length)
 #define MESSENGER_STATE_TYPE_FRIENDS     3
 #define MESSENGER_STATE_TYPE_NAME        4
 
-typedef uint16_t statelensub_t;
-
 /*  return size of the messenger data (for saving) */
 uint32_t Messenger_size(Messenger *m)
 {
-    uint32_t size32 = sizeof(uint32_t), lengthsublen = sizeof(statelensub_t);
-    uint32_t sizesubhead = lengthsublen + size32;
+    uint32_t size32 = sizeof(uint32_t), sizesubhead = size32 * 2;
     return   size32 * 2                                      // global cookie
            + sizesubhead + sizeof(uint32_t) +  crypto_box_PUBLICKEYBYTES + crypto_box_SECRETKEYBYTES
            + sizesubhead + DHT_size(m->dht)                  // DHT
@@ -1376,19 +1373,19 @@ uint32_t Messenger_size(Messenger *m)
            ;
 }
 
-static uint8_t *z_state_save_subheader(uint8_t *data, statelensub_t len, uint16_t type)
+static uint8_t *z_state_save_subheader(uint8_t *data, uint32_t len, uint16_t type)
 {
-    *(statelensub_t *)data = len;
-    data += sizeof(statelensub_t);
-    *(uint32_t *)data = (MESSENGER_STATE_COOKIE_TYPE << 16) | type;
-    data += sizeof(uint32_t);
+    uint32_t *data32 = (uint32_t *)data;
+    data32[0] = len;
+    data32[1] = (MESSENGER_STATE_COOKIE_TYPE << 16) | type;
+    data += sizeof(uint32_t) * 2;
     return data;
 }
 
 /* Save the messenger in data of size Messenger_size(). */
 void Messenger_save(Messenger *m, uint8_t *data)
 {
-    statelensub_t len;
+    uint32_t len;
     uint16_t type;
     uint32_t *data32, size32 = sizeof(uint32_t);
 
@@ -1484,17 +1481,15 @@ static int messenger_load_state_callback(void *outer, uint8_t *data, uint32_t le
 int Messenger_load(Messenger *m, uint8_t *data, uint32_t length)
 {
     uint32_t cookie_len = 2 * sizeof(uint32_t);
-    if (length > cookie_len) {
-        uint32_t *data32 = (uint32_t *)data;
-        if (!data32[0] && (data32[1] == MESSENGER_STATE_COOKIE_GLOBAL)) {
-            return load_state(messenger_load_state_callback, m, data + cookie_len,
-                              length - cookie_len, MESSENGER_STATE_COOKIE_TYPE);
-        }
-
-        /* old state file or too short */
-    }
+    if (length < cookie_len)
+        return -1;
 
-    return Messenger_load_old(m, data, length);
+    uint32_t *data32 = (uint32_t *)data;
+    if (!data32[0] && (data32[1] == MESSENGER_STATE_COOKIE_GLOBAL))
+        return load_state(messenger_load_state_callback, m, data + cookie_len,
+                          length - cookie_len, MESSENGER_STATE_COOKIE_TYPE);
+    else       /* old state file */
+        return Messenger_load_old(m, data, length);
 }
 
 /* Allocate and return a list of valid friend id's. List must be freed by the
diff --git a/toxcore/util.c b/toxcore/util.c
index 55b51709..653e8d5f 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -56,13 +56,13 @@ int load_state(load_state_callback_func load_state_callback, void *outer,
         return -1;
     }
 
-    state_length_sub_t length_sub;
+
     uint16_t type;
-    uint32_t size32 = sizeof(uint32_t), length_sub_len = sizeof(state_length_sub_t);
-    uint32_t size_head = length_sub_len + size32, cookie_type;
+    uint32_t length_sub, cookie_type;
+    uint32_t size32 = sizeof(uint32_t), size_head = size32 * 2;
     while (length > size_head) {
-        length_sub = *(state_length_sub_t *)data;
-        cookie_type = *(uint32_t *)(data + length_sub_len);
+        length_sub = *(uint32_t *)data;
+        cookie_type = *(uint32_t *)(data + size32);
         data += size_head;
         length -= size_head;
 
diff --git a/toxcore/util.h b/toxcore/util.h
index 41f558c1..00482862 100644
--- a/toxcore/util.h
+++ b/toxcore/util.h
@@ -14,7 +14,6 @@ bool ipp_eq(IP_Port a, IP_Port b);
 bool id_eq(uint8_t *dest, uint8_t *src);
 void id_cpy(uint8_t *dest, uint8_t *src);
 
-typedef uint16_t state_length_sub_t;
 typedef int (*load_state_callback_func)(void *outer, uint8_t *data, uint32_t len, uint16_t type);
 int load_state(load_state_callback_func load_state_callback, void *outer,
                         uint8_t *data, uint32_t length, uint16_t cookie_inner);