From 3521898b0cbf398d882496f6382f6c4ea1c23bc1 Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Thu, 8 Sep 2016 01:15:14 +0100
Subject: [PATCH] Fix potential null pointer dereference.

This used to not be an issue, but now that the logger is no longer
global, not all source locations may have access to it.
---
 toxcore/Messenger.c |  2 +-
 toxcore/assoc.c     | 10 +++++-----
 toxcore/assoc.h     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index e892779c..44664e3f 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -2506,7 +2506,7 @@ void do_messenger(Messenger *m, void *userdata)
     if (unix_time() > lastdump + DUMPING_CLIENTS_FRIENDS_EVERY_N_SECONDS) {
 
 #ifdef ENABLE_ASSOC_DHT
-        Assoc_status(m->dht->assoc);
+        Assoc_status(m->log, m->dht->assoc);
 #endif
 
         lastdump = unix_time();
diff --git a/toxcore/assoc.c b/toxcore/assoc.c
index 9060c3d4..d99786b0 100644
--- a/toxcore/assoc.c
+++ b/toxcore/assoc.c
@@ -1071,14 +1071,14 @@ static char *idpart2str(uint8_t *id, size_t len)
     return buffer;
 }
 
-void Assoc_status(const Assoc *assoc)
+void Assoc_status(Logger *log, const Assoc *assoc)
 {
     if (!assoc) {
-        LOGGER_TRACE(assoc->log, "Assoc status: no assoc");
+        LOGGER_TRACE(log, "Assoc status: no assoc");
         return;
     }
 
-    LOGGER_TRACE(assoc->log, "[b:p] hash => [id...] used, seen, heard");
+    LOGGER_TRACE(log, "[b:p] hash => [id...] used, seen, heard");
 
     size_t bid, cid, total = 0;
 
@@ -1091,7 +1091,7 @@ void Assoc_status(const Assoc *assoc)
             if (entry->hash) {
                 total++;
 
-                LOGGER_TRACE(assoc->log, "[%3i:%3i] %08x => [%s...] %i, %i(%c), %i(%c)\n",
+                LOGGER_TRACE(log, "[%3i:%3i] %08x => [%s...] %i, %i(%c), %i(%c)\n",
                              (int)bid, (int)cid, entry->hash, idpart2str(entry->client.public_key, 8),
                              entry->used_at ? (int)(unix_time() - entry->used_at) : 0,
                              entry->seen_at ? (int)(unix_time() - entry->seen_at) : 0,
@@ -1103,7 +1103,7 @@ void Assoc_status(const Assoc *assoc)
     }
 
     if (total) {
-        LOGGER_TRACE(assoc->log, "Total: %i entries, table usage %i%%.\n", (int)total,
+        LOGGER_TRACE(log, "Total: %i entries, table usage %i%%.\n", (int)total,
                      (int)(total * 100 / (assoc->candidates_bucket_count * assoc->candidates_bucket_size)));
     }
 }
diff --git a/toxcore/assoc.h b/toxcore/assoc.h
index e42e9c29..811ccef4 100644
--- a/toxcore/assoc.h
+++ b/toxcore/assoc.h
@@ -103,6 +103,6 @@ void do_Assoc(Assoc *assoc, DHT *dht);
 /* destroy */
 void kill_Assoc(Assoc *assoc);
 
-void Assoc_status(const Assoc *assoc);
+void Assoc_status(Logger *log, const Assoc *assoc);
 
 #endif /* !__ASSOC_H__ */