From 8dee8e2d29c0a13d4567e7048e673e8bbaccdbb8 Mon Sep 17 00:00:00 2001
From: Olivier Dion <olivier.dion@savoirfairelinux.com>
Date: Thu, 4 Aug 2022 13:12:59 -0400
Subject: [PATCH] logger: Resize arguments buffer to avoid junk
Also, extend padding of function name to 24 characters.
Change-Id: I98b39048152fc65bd9c04112393e47e481498170
---
src/logger.cpp | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/logger.cpp b/src/logger.cpp
index d33265a612..dce37e21a3 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -157,9 +157,9 @@ contextHeader(const char* const file, int line)
}
if (file) {
- return fmt::format(FMT_COMPILE("[{: >3d}.{:0<3d}|{: >4}|{: <18s}:{: <4d}]"), secs, milli, tid, stripDirName(file), line);
+ return fmt::format(FMT_COMPILE("[{: >3d}.{:0<3d}|{: >4}|{: <24s}:{: <4d}] "), secs, milli, tid, stripDirName(file), line);
} else {
- return fmt::format(FMT_COMPILE("[{: >3d}.{:0<3d}|{: >4}]"), secs, milli, tid);
+ return fmt::format(FMT_COMPILE("[{: >3d}.{:0<3d}|{: >4}] "), secs, milli, tid);
}
}
@@ -184,7 +184,10 @@ formatPrintfArgs(const char* format, va_list ap)
vsnprintf((char*) ret.data(), ret.size(), format, cp);
}
+ ret.resize(size);
+
va_end(cp);
+
return ret;
}
--
GitLab