Initialise memory before it's pointers are used in case of a failed allocation

1 files changed, 2 insertions, 6 deletions

diff --git a/src/trackerlogic.c b/src/trackerlogic.c
index d25ddac..7e8d969 100644
--- a/src/trackerlogic.c
+++ b/src/trackerlogic.c
@@ -65,14 +65,12 @@ void add_torrent_from_saved_state(ot_hash const hash, ot_time age, size_t down_c
   memset(torrent, 0, sizeof(ot_torrent));
   memcpy(torrent->hash, hash, sizeof(ot_hash));
 
-  if (!(torrent->peer_list6 = malloc(sizeof(ot_peerlist))) || !(torrent->peer_list4 = malloc(sizeof(ot_peerlist)))) {
+  if (!(torrent->peer_list6 = calloc(1, sizeof(ot_peerlist))) || !(torrent->peer_list4 = calloc(1, sizeof(ot_peerlist)))) {
     vector_remove_torrent(torrents_list, torrent);
     mutex_bucket_unlock_by_hash(hash, 0);
     return;
   }
 
-  memset(torrent->peer_list6, 0, sizeof(ot_peerlist));
-  memset(torrent->peer_list4, 0, sizeof(ot_peerlist));
   torrent->peer_list6->base       = time_now_minutes() - age;
   torrent->peer_list4->base       = time_now_minutes() - age;
   torrent->peer_list6->down_count = down_count;
@@ -110,14 +108,12 @@ size_t add_peer_to_torrent_and_return_peers(PROTO_FLAG proto, struct ot_workstru
     memset(torrent, 0, sizeof(ot_torrent));
     memcpy(torrent->hash, *ws->hash, sizeof(ot_hash));
 
-    if (!(torrent->peer_list6 = malloc(sizeof(ot_peerlist))) || !(torrent->peer_list4 = malloc(sizeof(ot_peerlist)))) {
+    if (!(torrent->peer_list6 = calloc(1, sizeof(ot_peerlist))) || !(torrent->peer_list4 = calloc(1, sizeof(ot_peerlist)))) {
       vector_remove_torrent(torrents_list, torrent);
       mutex_bucket_unlock_by_hash(*ws->hash, 0);
       return 0;
     }
 
-    memset(torrent->peer_list6, 0, sizeof(ot_peerlist));
-    memset(torrent->peer_list4, 0, sizeof(ot_peerlist));
     delta_torrentcount = 1;
   } else
     clean_single_torrent(torrent);