[checkmk-commits] Bug fix: va_start and va_end must be balanced. Always.

Module: check_mk Branch: master Commit: e1ae5ae14956af369982566d2e74136d30edc556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e1ae5ae14956af… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Mon Nov 9 08:55:01 2015 +0100 Bug fix: va_start and va_end must be balanced. Always. --- livestatus/src/logger.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index 7a0d014..fec46b4 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -61,9 +61,8 @@ void logger(int priority, const char *loginfo, ...) if (!g_logfile || g_mainthread_id == pthread_self()) { char buffer[8192]; snprintf(buffer, 20, "livestatus: "); - vsnprintf(buffer + strlen(buffer), - sizeof(buffer) - strlen(buffer), loginfo, ap); - va_end(ap); + vsnprintf(buffer + strlen(buffer), sizeof(buffer) - strlen(buffer), + loginfo, ap); write_to_all_logs(buffer, priority); } else { @@ -71,7 +70,8 @@ void logger(int priority, const char *loginfo, ...) /* write date/time */ char timestring[64]; time_t now_t = time(0); - struct tm now; localtime_r(&now_t, &now); + struct tm now; + localtime_r(&now_t, &now); strftime(timestring, 64, "%F %T ", &now); fputs(timestring, g_logfile); @@ -79,7 +79,7 @@ void logger(int priority, const char *loginfo, ...) vfprintf(g_logfile, loginfo, ap); fputc('\n', g_logfile); fflush(g_logfile); - va_end(ap); } } + va_end(ap); }