filebuf: Fix printf buffer overflows

The filebuf was not being properly written after a flush. This should
cut it now.

Fixes #228
This commit is contained in:
Vicent Marti 2011-06-06 01:54:59 +02:00
parent 2b397327e6
commit f9213015fd

View File

@ -363,14 +363,19 @@ int git_filebuf_printf(git_filebuf *file, const char *format, ...)
int len, error; int len, error;
va_start(arglist, format); va_start(arglist, format);
len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist); len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist);
va_end(arglist);
if (len < 0 || (size_t)len >= space_left) { if (len < 0 || (size_t)len >= space_left) {
if ((error = flush_buffer(file)) < GIT_SUCCESS) if ((error = flush_buffer(file)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to output to buffer"); return git__rethrow(error, "Failed to output to buffer");
space_left = file->buf_size - file->buf_pos;
va_start(arglist, format);
len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist); len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist);
va_end(arglist);
if (len < 0 || (size_t)len > file->buf_size) if (len < 0 || (size_t)len > file->buf_size)
return GIT_ENOMEM; return GIT_ENOMEM;
} }