mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-28 11:36:10 +02:00
Code

Merge branch 'rs/receive-pack-argv-leak-fix' 

* rs/receive-pack-argv-leak-fix:
  receive-pack: plug minor memory leak in unpack()
This commit is contained in:
Junio C Hamano 2014-10-20 12:23:45 -07:00
parent 713ee7fe46 64a7e92f28
commit b67588d018
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
builtin/receive-pack.c
View File

@ -1230,7 +1230,6 @@ static const char *pack_lockfile;
static const char *unpack(int err_fd, struct shallow_info *si)
{
struct pack_header hdr;
struct argv_array av = ARGV_ARRAY_INIT;
const char *hdr_err;
int status;
char hdr_arg[38];
@ -1253,16 +1252,16 @@ static const char *unpack(int err_fd, struct shallow_info *si)
if (si->nr_ours || si->nr_theirs) {
alt_shallow_file = setup_temporary_shallow(si->shallow);
argv_array_pushl(&av, "--shallow-file", alt_shallow_file, NULL);
argv_array_push(&child.args, "--shallow-file");
argv_array_push(&child.args, alt_shallow_file);
}
if (ntohl(hdr.hdr_entries) < unpack_limit) {
argv_array_pushl(&av, "unpack-objects", hdr_arg, NULL);
argv_array_pushl(&child.args, "unpack-objects", hdr_arg, NULL);
if (quiet)
argv_array_push(&av, "-q");
argv_array_push(&child.args, "-q");
if (fsck_objects)
argv_array_push(&av, "--strict");
child.argv = av.argv;
argv_array_push(&child.args, "--strict");
child.no_stdout = 1;
child.err = err_fd;
child.git_cmd = 1;
@ -1277,13 +1276,12 @@ static const char *unpack(int err_fd, struct shallow_info *si)
if (gethostname(keep_arg + s, sizeof(keep_arg) - s))
strcpy(keep_arg + s, "localhost");
argv_array_pushl(&av, "index-pack",
argv_array_pushl(&child.args, "index-pack",
"--stdin", hdr_arg, keep_arg, NULL);
if (fsck_objects)
argv_array_push(&av, "--strict");
argv_array_push(&child.args, "--strict");
if (fix_thin)
argv_array_push(&av, "--fix-thin");
child.argv = av.argv;
argv_array_push(&child.args, "--fix-thin");
child.out = -1;
child.err = err_fd;
child.git_cmd = 1;