summaryrefslogtreecommitdiff
path: root/builtin-send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-08 01:38:12 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-08 01:43:34 -0800
commit6738c8194286fa0017f72cb57628dcae9ec07b27 (patch)
tree6af8805826bddec635fc079c4e28349104a4faa2 /builtin-send-pack.c
parentb50fa2bd061c3bb21f2918849ece43ac9ca2c504 (diff)
downloadgit-6738c8194286fa0017f72cb57628dcae9ec07b27.tar.gz
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>
Diffstat (limited to 'builtin-send-pack.c')
-rw-r--r--builtin-send-pack.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index c1fd3f5fbb..5a0f5c681c 100644
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -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 {