From 9706d9a0f015a58937255abd95101045ab865796 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 17 Mar 2018 14:48:34 +0000 Subject: Disallow stderr logger by default. --- toxcore/Messenger.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'toxcore/Messenger.c') 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) { -- cgit v1.2.3