1 files changed, 6 insertions, 6 deletions

diff --git a/trackerlogic.c b/trackerlogic.c
index d8a2f9b..db1d787 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -13,26 +13,26 @@
 /* Libowfat */
 #include "io.h"
 #include "iob.h"
-#include "ip6.h"
 
 /* Opentracker */
 #include "ot_accesslist.h"
 #include "ot_clean.h"
 #include "ot_fullscrape.h"
 #include "ot_http.h"
+#include "ot_ip.h"
 #include "ot_livesync.h"
 #include "ot_mutex.h"
 #include "ot_random.h"
 #include "ot_stats.h"
-#include "ot_vector.h"
 #include "ot_udp.h"
+#include "ot_vector.h"
 #include "trackerlogic.h"
 
 /* Forward declaration */
 size_t return_peers_for_torrent(struct ot_workstruct *ws, ot_torrent *torrent, size_t amount, char *reply, PROTO_FLAG proto);
 
-void   free_peerlist(ot_peerlist *peer_list) {
-  if (peer_list->peers.data) {
+void free_peerlist(ot_peerlist *peer_list) {
+  if (peer_list && peer_list->peers.data) {
     if (OT_PEERLIST_HASBUCKETS(peer_list))
       vector_clean_list((ot_vector *)peer_list->peers.data, peer_list->peers.size);
     else
@@ -511,7 +511,7 @@ void iterate_all_torrents(int (*for_each)(ot_torrent *torrent, uintptr_t data),
 
 ot_peer *peer_from_peer6(ot_peer6 *peer, size_t *peer_size) {
   ot_ip6 *ip = (ot_ip6 *)peer;
-  if (!ip6_isv4mapped(ip)) {
+  if (!ip_is_v4mapped(ip)) {
     *peer_size = OT_PEER_SIZE6;
     return (ot_peer *)peer;
   }
@@ -521,7 +521,7 @@ ot_peer *peer_from_peer6(ot_peer6 *peer, size_t *peer_size) {
 
 size_t peer_size_from_peer6(ot_peer6 *peer) {
   ot_ip6 *ip = (ot_ip6 *)peer;
-  if (!ip6_isv4mapped(ip))
+  if (!ip_is_v4mapped(ip))
     return OT_PEER_SIZE6;
   return OT_PEER_SIZE4;
 }