Skip to contentSkip to conversation

Prevent send-pack from segfaulting when a branch doesn't match

PATCH In review Shawn O. Pearce 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 3/3 Prevent send-pack from segfaulting when a branch doesn't match

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.

---
 remote.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
remote.c +4 -1
index 2166a2b..e7d735b 100644
@@ -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:
Signature · 1 line
1.5.3.2.124.g2456-dirty