Skip to content

Commit

Permalink
upload-pack: fix race condition in error messages
Browse files Browse the repository at this point in the history
Test t5516-fetch-push.sh has a test 'deny fetch unreachable SHA1,
allowtipsha1inwant=true' that checks stderr for a specific error
string from the remote. In some build environments the error sent
over the remote connection gets mingled with the error from the
die() statement. Since both signals are being output to the same
file descriptor (but from parent and child processes), the output
we are matching with grep gets split.

To reduce the risk of this failure, follow this process instead:

1. Write an error message to stderr.
2. Write an error message across the connection.
3. exit(1).

This reorders the events so the error is written entirely before
the client receives a message from the remote, removing the race
condition.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
  • Loading branch information
derrickstolee committed Aug 27, 2019
1 parent 5fa0f52 commit 5c313ab
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions upload-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -613,11 +613,12 @@ static void check_non_tip(struct object_array *want_obj,
for (i = 0; i < want_obj->nr; i++) {
struct object *o = want_obj->objects[i].item;
if (!is_our_ref(o)) {
warning("git upload-pack: not our ref %s",
oid_to_hex(&o->oid));
packet_writer_error(writer,
"upload-pack: not our ref %s",
oid_to_hex(&o->oid));
die("git upload-pack: not our ref %s",
oid_to_hex(&o->oid));
exit(1);
}
}
}
Expand Down

0 comments on commit 5c313ab

Please sign in to comment.