From 1394758d69c644fde12cb15fdb83592875cd017b Mon Sep 17 00:00:00 2001 From: Tianhua Sun Date: Thu, 11 Jul 2019 09:20:01 +0800 Subject: [PATCH] tools: fix variable argument list read without ending with va_end va_end() was not getting called under certain condition after the va_start() function call taking the va_list Tracked-On: #3396 Signed-off-by: Tianhua Sun Acked-by: Gang Chen --- tools/acrn-crashlog/common/log_sys.c | 8 ++++++-- tools/acrn-crashlog/usercrash/crash_dump.c | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/acrn-crashlog/common/log_sys.c b/tools/acrn-crashlog/common/log_sys.c index 44006d9e7..9673840c4 100644 --- a/tools/acrn-crashlog/common/log_sys.c +++ b/tools/acrn-crashlog/common/log_sys.c @@ -21,10 +21,14 @@ void debug_log(const int level, const char *func, const int line, ...) va_start(args, line); fmt = va_arg(args, char *); - if (!fmt) + if (!fmt) { + va_end(args); return; - if (vasprintf(&msg, fmt, args) == -1) + } + if (vasprintf(&msg, fmt, args) == -1) { + va_end(args); return; + } va_end(args); if (asprintf(&head, "<%-20s%5d>: ", func, line) == -1) { diff --git a/tools/acrn-crashlog/usercrash/crash_dump.c b/tools/acrn-crashlog/usercrash/crash_dump.c index 14ea1427c..289d99623 100644 --- a/tools/acrn-crashlog/usercrash/crash_dump.c +++ b/tools/acrn-crashlog/usercrash/crash_dump.c @@ -36,11 +36,11 @@ static void loginfo(int fd, const char *fmt, ...) va_start(ap, fmt); len = vasprintf(&buf, fmt, ap); + va_end(ap); if (len == -1) { LOGE("write to buf failed\n"); return; } - va_end(ap); ret = write(fd, buf, len); if (ret != len) {