Skip to content

Commit

Permalink
Prevent send-pack from segfaulting when a branch doesn't match
Browse files Browse the repository at this point in the history
If `git push url foo` can't find a local branch named foo we can't
match it to any remote branch as the local branch is NULL and its
name is probably at position 0x34 in memory.  On most systems that
isn't a valid address for git-send-pack's virtual address space
and we segfault.

If we can't find a source match and we have no destination we
need to abort the match function early before we try to match the
destination against the remote.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Shawn O. Pearce authored and Junio C Hamano committed Sep 25, 2007
1 parent 7dfee37 commit 4491e62
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion remote.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,11 @@ static int match_explicit(struct ref *src, struct ref *dst,
if (!matched_src)
errs = 1;

if (!dst_value)
if (!dst_value) {
if (!matched_src)
return errs;
dst_value = matched_src->name;
}

switch (count_refspec_match(dst_value, dst, &matched_dst)) {
case 1:
Expand Down

0 comments on commit 4491e62

Please sign in to comment.