Fix a bug in savedata loading when malloc fails.

Also added a bunch of asserts to tests where they don't check allocs.

6 files changed, 13 insertions, 2 deletions

diff --git a/auto_tests/TCP_test.c b/auto_tests/TCP_test.c
index 9206e265..8a109317 100644
--- a/auto_tests/TCP_test.c
+++ b/auto_tests/TCP_test.c
@@ -185,6 +185,7 @@ struct sec_TCP_con {
 static struct sec_TCP_con *new_TCP_con(TCP_Server *tcp_s, Mono_Time *mono_time)
 {
     struct sec_TCP_con *sec_c = (struct sec_TCP_con *)malloc(sizeof(struct sec_TCP_con));
+    ck_assert(sec_c != nullptr);
     Socket sock = net_socket(net_family_ipv6, TOX_SOCK_STREAM, TOX_PROTO_TCP);
 
     IP_Port ip_port_loopback;
diff --git a/auto_tests/conference_invite_merge_test.c b/auto_tests/conference_invite_merge_test.c
index e7ec499c..21445525 100644
--- a/auto_tests/conference_invite_merge_test.c
+++ b/auto_tests/conference_invite_merge_test.c
@@ -91,9 +91,11 @@ static void reload(Tox **toxes, State *state, uint32_t n)
     ck_assert(state[n].save_state != nullptr);
 
     struct Tox_Options *const options = tox_options_new(nullptr);
+    ck_assert(options != nullptr);
     tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
     tox_options_set_savedata_data(options, state[n].save_state, state[n].save_size);
     toxes[n] = tox_new_log(options, nullptr, &state[n].index);
+    ck_assert(toxes[n] != nullptr);
     tox_options_free(options);
 
     set_mono_time_callback(toxes[n], &state[n]);
diff --git a/auto_tests/conference_peer_nick_test.c b/auto_tests/conference_peer_nick_test.c
index 9d10a8a9..749f9098 100644
--- a/auto_tests/conference_peer_nick_test.c
+++ b/auto_tests/conference_peer_nick_test.c
@@ -68,6 +68,7 @@ static void rebuild_peer_list(Tox *tox)
                           "failed to get conference peer %u's name size (conference = %u): err = %d", peer_number, conference_number, err);
 
             uint8_t *const name = (uint8_t *)malloc(size);
+            ck_assert(name != nullptr);
             tox_conference_peer_get_name(tox, conference_number, peer_number, name, &err);
             ck_assert_msg(err == TOX_ERR_CONFERENCE_PEER_QUERY_OK,
                           "failed to get conference peer %u's name (conference = %u): err = %d", peer_number, conference_number, err);
diff --git a/auto_tests/conference_test.c b/auto_tests/conference_test.c
index ec88c82a..11a7bb06 100644
--- a/auto_tests/conference_test.c
+++ b/auto_tests/conference_test.c
@@ -250,9 +250,11 @@ static void run_conference_tests(Tox **toxes, State *state)
     for (uint32_t i = 0; i < NUM_GROUP_TOX; ++i) {
         if (restarting[i]) {
             struct Tox_Options *const options = tox_options_new(nullptr);
+            ck_assert(options != nullptr);
             tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
             tox_options_set_savedata_data(options, save[i], save_size[i]);
             toxes[i] = tox_new_log(options, nullptr, &state[i].index);
+            ck_assert(toxes[i] != nullptr);
             tox_options_free(options);
             free(save[i]);
 
diff --git a/auto_tests/encryptsave_test.c b/auto_tests/encryptsave_test.c
index 19574d16..ccb1ee88 100644
--- a/auto_tests/encryptsave_test.c
+++ b/auto_tests/encryptsave_test.c
@@ -76,6 +76,7 @@ static void test_save_friend(void)
     ck_assert_msg(tox_is_data_encrypted(enc_data), "magic number missing");
 
     struct Tox_Options *options = tox_options_new(nullptr);
+    ck_assert(options != nullptr);
     tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
     tox_options_set_savedata_data(options, enc_data, size2);
 
diff --git a/auto_tests/file_saving_test.c b/auto_tests/file_saving_test.c
index 7faa6b20..cdcce95f 100644
--- a/auto_tests/file_saving_test.c
+++ b/auto_tests/file_saving_test.c
@@ -64,6 +64,7 @@ static void save_data_encrypted(void)
 static void load_data_decrypted(void)
 {
     FILE *f = fopen(savefile, "r");
+    ck_assert(f != nullptr);
     fseek(f, 0, SEEK_END);
     int64_t size = ftell(f);
     fseek(f, 0, SEEK_SET);
@@ -71,7 +72,9 @@ static void load_data_decrypted(void)
     ck_assert_msg(0 <= size && size <= UINT_MAX, "file size out of range");
 
     uint8_t *cipher = (uint8_t *)malloc(size);
+    ck_assert(cipher != nullptr);
     uint8_t *clear = (uint8_t *)malloc(size - TOX_PASS_ENCRYPTION_EXTRA_LENGTH);
+    ck_assert(clear != nullptr);
     size_t read_value = fread(cipher, sizeof(*cipher), size, f);
     printf("Read read_value = %u of %u\n", (unsigned)read_value, (unsigned)size);
 
@@ -81,6 +84,7 @@ static void load_data_decrypted(void)
                   "Could not decrypt, error code %d.", derr);
 
     struct Tox_Options *options = tox_options_new(nullptr);
+    ck_assert(options != nullptr);
 
     tox_options_set_savedata_type(options, TOX_SAVEDATA_TYPE_TOX_SAVE);
 
@@ -101,10 +105,10 @@ static void load_data_decrypted(void)
     ck_assert_msg(strcmp((const char *)readname, name) == 0,
                   "name returned by tox_self_get_name does not match expected result");
 
-    free(cipher);
+    tox_kill(t);
     free(clear);
+    free(cipher);
     fclose(f);
-    tox_kill(t);
 }
 
 int main(void)