mirror of
https://github.com/git/git.git
synced 2024-11-27 20:14:30 +08:00
upload-pack: don't send null character in abort message to the client
Since 583b7ea31b
(upload-pack/fetch-pack: support side-band
communication, 2006-06-21) the abort message sent by upload-pack in
case of possible repository corruption ends with a null character.
This can be seen in several test cases in 't5530-upload-pack-error.sh'
where 'grep <pattern> output.err' often reports "Binary file
output.err matches" because of that null character.
The reason for this is that the abort message is defined as a string
literal, and we pass its size to the send function as
sizeof(abort_msg), which also counts the terminating null character.
Use strlen() instead to avoid sending that terminating null character.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
3c2a3fdc38
commit
3f4c7a0805
@ -463,7 +463,7 @@ static void create_pack_file(struct upload_pack_data *pack_data,
|
||||
|
||||
fail:
|
||||
free(output_state);
|
||||
send_client_data(3, abort_msg, sizeof(abort_msg),
|
||||
send_client_data(3, abort_msg, strlen(abort_msg),
|
||||
pack_data->use_sideband);
|
||||
die("git upload-pack: %s", abort_msg);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user