Skip to content

Commit

Permalink
Clear fd after closing to avoid double-close error
Browse files Browse the repository at this point in the history
In send_pack(), clear the fd passed to pack_objects() by setting
it to -1, since pack_objects() closes the fd (via a call to
run_command()).  Likewise, in get_pack(), clear the fd passed to
run_command().

Not doing so risks having git_transport_push(), caller of
send_pack(), closing the fd again, possibly incorrectly closing
some other open file; or similarly with fetch_refs_from_pack(),
indirect caller of get_pack().

Signed-off-by: Jens Lindström <jl@opera.com>
Acked-by: Jeff King <peff@peff.net>
Acked-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jens Lindstrom authored and Junio C Hamano committed Oct 23, 2013
1 parent 5f737ac commit 37cb1dd
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -776,6 +776,10 @@ static int get_pack(struct fetch_pack_args *args,
close(cmd.out);
}

if (!use_sideband)
/* Closed by start_command() */
xd[0] = -1;

ret = finish_command(&cmd);
if (!ret || (args->check_self_contained_and_connected && ret == 1))
args->self_contained_and_connected =
Expand Down
4 changes: 4 additions & 0 deletions send-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,12 @@ int send_pack(struct send_pack_args *args,
shutdown(fd[0], SHUT_WR);
if (use_sideband)
finish_async(&demux);
fd[1] = -1;
return -1;
}
if (!args->stateless_rpc)
/* Closed by pack_objects() via start_command() */
fd[1] = -1;
}
if (args->stateless_rpc && cmds_sent)
packet_flush(out);
Expand Down

0 comments on commit 37cb1dd

Please sign in to comment.