Skip to content

L
lxc
Commit aa74ed7b by Christian Brauner Committed by GitHub
Options

Merge pull request #1225 from jiazhang0/master

log: sanity check the returned value from snprintf()
parents b8fc6b36 f6c79610
Showing with 6 additions and 3 deletions
src/lxc/log.c
...@@ -170,10 +170,13 @@ static int log_append_logfile(const struct lxc_log_appender *appender, ...@@ -170,10 +170,13 @@ static int log_append_logfile(const struct lxc_log_appender *appender,
event->locinfo->file, event->locinfo->func, event->locinfo->file, event->locinfo->func,
event->locinfo->line); event->locinfo->line);
n += vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt, if (n < 0)
*event->vap); return n;
if (n >= sizeof(buffer) - 1) { if (n < sizeof(buffer) - 1)
n += vsnprintf(buffer + n, sizeof(buffer) - n, event->fmt,
*event->vap);
else {
WARN("truncated next event from %d to %zd bytes", n, WARN("truncated next event from %d to %zd bytes", n,
sizeof(buffer)); sizeof(buffer));
n = sizeof(buffer) - 1; n = sizeof(buffer) - 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment