Fix bugs in [v]snprintf usage

[fio.git] / log.c

diff --git a/log.c b/log.c
index af974f85b594abc1951b4bfb77ad625f4887b529..08509b32b0150f85a55d76c38776d00d856be159 100644 (file)
--- a/log.c
+++ b/log.c
@@ -12,6 +12,7 @@ int log_valist(const char *str, va_list args)
        size_t len;
 
        len = vsnprintf(buffer, sizeof(buffer), str, args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (log_syslog)
                syslog(LOG_INFO, "%s", buffer);
@@ -40,6 +41,7 @@ int log_local(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (log_syslog)
                syslog(LOG_INFO, "%s", buffer);
@@ -58,6 +60,7 @@ int log_info(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
                return fio_server_text_output(buffer, len);
@@ -77,6 +80,7 @@ int log_err(const char *format, ...)
        va_start(args, format);
        len = vsnprintf(buffer, sizeof(buffer), format, args);
        va_end(args);
+       len = min(len, sizeof(buffer) - 1);
 
        if (is_backend)
                return fio_server_text_output(buffer, len);