From 957962476599d99ce2d47257388afd36b342a235 Mon Sep 17 00:00:00 2001 From: michelle legrand Date: Wed, 14 Jan 2015 12:02:21 +0100 Subject: [PATCH] eina: fix Eina_Log to only try to free non deleted log. @fix --- src/lib/eina/eina_log.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/lib/eina/eina_log.c b/src/lib/eina/eina_log.c index 9146ba2..c3174ff 100644 --- a/src/lib/eina/eina_log.c +++ b/src/lib/eina/eina_log.c @@ -1202,7 +1202,8 @@ eina_log_print_unlocked(int domain, EINA_UNLIKELY(domain < 0)) { if (file && fnc && fmt) - fprintf( + { + fprintf( stderr, "CRI: %s:%d %s() eina_log_print() unknown domain %d, original message format '%s'\n", file, @@ -1210,12 +1211,15 @@ eina_log_print_unlocked(int domain, fnc, domain, fmt); + } else - fprintf( + { + fprintf( stderr, "CRI: eina_log_print() unknown domain %d, original message format '%s'\n", domain, fmt ? fmt : ""); + } if (_abort_on_critical) abort(); @@ -1580,10 +1584,12 @@ eina_log_color_disable_set(Eina_Bool disabled) for (i = 0; i < _log_domains_count; i++) { + if (_log_domains[i].deleted) + continue; + domain = &_log_domains[i]; - if (domain->domain_str) - free((char *)domain->domain_str); + free((char *)domain->domain_str); if ((domain->color) && (!_disable_color)) domain->domain_str = eina_log_domain_str_get(domain->name, domain->color); -- 2.7.4