kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

upload-archive: convert sprintf to strbuf 

When we report an error to the client, we format it into a
fixed-size buffer using vsprintf(). This can't actually
overflow in practice, since we only format a very tame
subset of strings (mostly strerror() output). However, it's
hard to tell immediately, so let's just use a strbuf so
readers do not have to wonder.

We do add an allocation here, but the performance is not
important; the next step is to call die() anyway.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-09-24 17:07:25 -04:00 committed by Junio C Hamano
parent 495127dbcb
commit 0cb9d6d6b6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin/upload-archive.c
View File

@ -49,15 +49,14 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
__attribute__((format (printf, 1, 2))) __attribute__((format (printf, 1, 2)))
static void error_clnt(const char *fmt, ...) static void error_clnt(const char *fmt, ...)
{ {
char buf[1024]; struct strbuf buf = STRBUF_INIT;
va_list params; va_list params;
int len;


va_start(params, fmt); va_start(params, fmt);
len = vsprintf(buf, fmt, params); strbuf_vaddf(&buf, fmt, params);
va_end(params); va_end(params);
send_sideband(1, 3, buf, len, LARGE_PACKET_MAX); send_sideband(1, 3, buf.buf, buf.len, LARGE_PACKET_MAX);
die("sent error to the client: %s", buf); die("sent error to the client: %s", buf.buf);
} }


static ssize_t process_input(int child_fd, int band) static ssize_t process_input(int child_fd, int band)