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

Merge branch 'jl/pack-transfer-avoid-double-close'

Browse Source 
The codepath that send_pack() calls pack_objects() mistakenly
closed the same file descriptor twice, leading to potentially
closing a wrong file descriptor that was opened in the meantime.

* jl/pack-transfer-avoid-double-close:
  Clear fd after closing to avoid double-close error
This commit is contained in:
Junio C Hamano 2013-10-30 12:10:45 -07:00
commit 832ee79ab8
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fetch-pack.c
View File

@ -747,6 +747,10 @@ static int get_pack(struct fetch_pack_args *args,
close(cmd.out); close(cmd.out);
} }
if (!use_sideband)
/* Closed by start_command() */
xd[0] = -1;
ret = finish_command(&cmd); ret = finish_command(&cmd);
if (!ret || (args->check_self_contained_and_connected && ret == 1)) if (!ret || (args->check_self_contained_and_connected && ret == 1))
args->self_contained_and_connected = args->self_contained_and_connected =

4
send-pack.c
View File

@ -302,8 +302,12 @@ int send_pack(struct send_pack_args *args,
shutdown(fd[0], SHUT_WR); shutdown(fd[0], SHUT_WR);
if (use_sideband) if (use_sideband)
finish_async(&demux); finish_async(&demux);
fd[1] = -1;
return -1; return -1;
} }
if (!args->stateless_rpc)
/* Closed by pack_objects() via start_command() */
fd[1] = -1;
} }
if (args->stateless_rpc && cmds_sent) if (args->stateless_rpc && cmds_sent)
packet_flush(out); packet_flush(out);