mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
send-pack: segfault fix on forced push
When pushing to overwrite a ref that points at a commit we do not even have, the recent "terse push" patch tried to get a unique abbreviation for the non-existent (from our point of view) object, which resulted in strcpy(buf, NULL) and segfaulted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
b50fa2bd06
commit
6738c81942
|
@ -365,8 +365,9 @@ static int do_send_pack(int in, int out, struct remote *remote, const char *dest
|
|||
char quickref[83];
|
||||
char type = ' ';
|
||||
const char *msg = "";
|
||||
|
||||
strcpy(quickref, find_unique_abbrev(ref->old_sha1, DEFAULT_ABBREV));
|
||||
const char *old_abb;
|
||||
old_abb = find_unique_abbrev(ref->old_sha1, DEFAULT_ABBREV);
|
||||
strcpy(quickref, old_abb ? old_abb : old_hex);
|
||||
if (ref_newer(ref->peer_ref->new_sha1, ref->old_sha1))
|
||||
strcat(quickref, "..");
|
||||
else {
|
||||
|
|
42
t/t5405-send-pack-rewind.sh
Executable file
42
t/t5405-send-pack-rewind.sh
Executable file
|
@ -0,0 +1,42 @@
|
|||
#!/bin/sh
|
||||
|
||||
test_description='forced push to replace commit we do not have'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
test_expect_success setup '
|
||||
|
||||
>file1 && git add file1 && test_tick &&
|
||||
git commit -m Initial &&
|
||||
|
||||
mkdir another && (
|
||||
cd another &&
|
||||
git init &&
|
||||
git fetch .. master:master
|
||||
) &&
|
||||
|
||||
>file2 && git add file2 && test_tick &&
|
||||
git commit -m Second
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'non forced push should die not segfault' '
|
||||
|
||||
(
|
||||
cd another &&
|
||||
git push .. master:master
|
||||
test $? = 1
|
||||
)
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'forced push should succeed' '
|
||||
|
||||
(
|
||||
cd another &&
|
||||
git push .. +master:master
|
||||
)
|
||||
|
||||
'
|
||||
|
||||
test_done
|
Loading…
Reference in a new issue