3 files changed, 18 insertions, 13 deletions

diff --git a/toxcore/Messenger.c b/toxcore/Messenger.c
index 4a24ae5f..2408c844 100644
--- a/toxcore/Messenger.c
+++ b/toxcore/Messenger.c
@@ -1977,26 +1977,24 @@ Messenger *new_messenger(Messenger_Options *options, unsigned int *error)
         return nullptr;
     }
 
-    Logger *log = nullptr;
+    m->log = logger_new();
 
-    if (options->log_callback) {
-        log = logger_new();
-
-        if (log != nullptr) {
-            logger_callback_log(log, options->log_callback, m, options->log_user_data);
-        }
+    if (m->log == nullptr) {
+        friendreq_kill(m->fr);
+        free(m);
+        return nullptr;
     }
 
-    m->log = log;
+    logger_callback_log(m->log, options->log_callback, m, options->log_user_data);
 
     unsigned int net_err = 0;
 
     if (options->udp_disabled) {
-        m->net = new_networking_no_udp(log);
+        m->net = new_networking_no_udp(m->log);
     } else {
         IP ip;
         ip_init(&ip, options->ipv6enabled);
-        m->net = new_networking_ex(log, ip, options->port_range[0], options->port_range[1], &net_err);
+        m->net = new_networking_ex(m->log, ip, options->port_range[0], options->port_range[1], &net_err);
     }
 
     if (m->net == nullptr) {
diff --git a/toxcore/logger.c b/toxcore/logger.c
index 80195e93..ff34f994 100644
--- a/toxcore/logger.c
+++ b/toxcore/logger.c
@@ -27,6 +27,7 @@
 
 #include "logger.h"
 
+#include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -38,7 +39,7 @@ struct Logger {
     void *userdata;
 };
 
-
+#ifdef USE_STDERR_LOGGER
 static const char *logger_level_name(LOGGER_LEVEL level)
 {
     switch (level) {
@@ -73,7 +74,7 @@ static const Logger logger_stderr = {
     nullptr,
     nullptr,
 };
-
+#endif
 
 /**
  * Public Functions
@@ -99,7 +100,11 @@ void logger_write(const Logger *log, LOGGER_LEVEL level, const char *file, int l
                   const char *format, ...)
 {
     if (!log) {
+#ifdef USE_STDERR_LOGGER
         log = &logger_stderr;
+#else
+        assert(!"NULL logger not permitted");
+#endif
     }
 
     if (!log->callback) {
diff --git a/toxcore/logger.h b/toxcore/logger.h
index 2a6ee2ed..acd21fb8 100644
--- a/toxcore/logger.h
+++ b/toxcore/logger.h
@@ -67,7 +67,9 @@ void logger_callback_log(Logger *log, logger_cb *function, void *context, void *
  * If the logger is NULL, this writes to stderr. This behaviour should not be
  * used in production code, but can be useful for temporarily debugging a
  * function that does not have a logger available. It's essentially
- * fprintf(stderr, ...), but with timestamps and source location.
+ * fprintf(stderr, ...), but with timestamps and source location. Toxcore must
+ * be built with -DUSE_STDERR_LOGGER for this to work. It will cause an
+ * assertion failure otherwise.
  */
 void logger_write(
     const Logger *log, LOGGER_LEVEL level, const char *file, int line, const char *func,