undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a memory leak in "connect.c" and die if command too long.

Browse Source 
Use "add_to_string" instead of "sq_quote" and "snprintf", so
that there is no memory allocation and no memory leak.
Also check if the command is too long to fit into the buffer
and die if this is the case, instead of truncating it to the
buffer size.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Christian Couder 2006-09-11 07:04:50 +02:00 committed by Junio C Hamano
parent 86257aa324
commit 0f503d77ac
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
connect.c
View File

@ -599,12 +599,13 @@ static void git_proxy_connect(int fd[2], char *host)
close(pipefd[1][0]); close(pipefd[1][0]);
} }
#define MAX_CMD_LEN 1024
/* /*
* Yeah, yeah, fixme. Need to pass in the heads etc. * Yeah, yeah, fixme. Need to pass in the heads etc.
*/ */
int git_connect(int fd[2], char *url, const char *prog) int git_connect(int fd[2], char *url, const char *prog)
{ {
char command[1024];
char *host, *path = url; char *host, *path = url;
char *end; char *end;
int c; int c;
@ -697,8 +698,18 @@ int git_connect(int fd[2], char *url, const char *prog)
if (pid < 0) if (pid < 0)
die("unable to fork"); die("unable to fork");
if (!pid) { if (!pid) {
snprintf(command, sizeof(command), "%s %s", prog, char command[MAX_CMD_LEN];
sq_quote(path)); char *posn = command;
int size = MAX_CMD_LEN;
int of = 0;
of |= add_to_string(&posn, &size, prog, 0);
of |= add_to_string(&posn, &size, " ", 0);
of |= add_to_string(&posn, &size, path, 1);
if (of)
die("command line too long");
dup2(pipefd[1][0], 0); dup2(pipefd[1][0], 0);
dup2(pipefd[0][1], 1); dup2(pipefd[0][1], 1);
close(pipefd[0][0]); close(pipefd[0][0]);