Skip to content

Commit

Permalink
Need bigger log buffer to avoid message truncation
Browse files Browse the repository at this point in the history
The help message of CRIU has grown in size and is truncated because the
size of the private buffer in log.c is too small.  This patch increases
the size of the buffer.

[ The "bad" message is the --help output one ]

Signed-off-by: Saied Kazemi <saied@google.com>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
  • Loading branch information
Saied Kazemi authored and xemul committed Jul 13, 2015
1 parent 1fff98f commit 49dc94a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions log.c
Expand Up @@ -25,7 +25,7 @@

static unsigned int current_loglevel = DEFAULT_LOGLEVEL;

static char buffer[PAGE_SIZE];
static char buffer[PAGE_SIZE * 2];
static char buf_off = 0;

static struct timeval start;
Expand Down Expand Up @@ -123,7 +123,7 @@ int log_init_by_pid(void)
reset_buf_off();

if (!opts.log_file_per_pid) {
buf_off += snprintf(buffer + buf_off, PAGE_SIZE - buf_off, "%6d: ", getpid());
buf_off += snprintf(buffer + buf_off, sizeof buffer - buf_off, "%6d: ", getpid());
return 0;
}

Expand Down Expand Up @@ -169,7 +169,7 @@ static void __print_on_level(unsigned int loglevel, const char *format, va_list
print_ts();
}

size = vsnprintf(buffer + buf_off, PAGE_SIZE - buf_off, format, params);
size = vsnprintf(buffer + buf_off, sizeof buffer - buf_off, format, params);
size += buf_off;

while (off < size) {
Expand Down

0 comments on commit 49dc94a

Please sign in to comment.