From: Nipunn Koorapati <nipunn@xxxxxxxxxxx>
The logic added to check for negative pathspec match by c0192df630
(refspec: add support for negative refspecs, 2020-09-30) looks at
refspec->src assuming it is never NULL, however when
remote.origin.push is set to ":", then refspec->src is NULL,
causing a segfault within strcmp
Added testing for this case in fetch-negative-refspec
Signed-off-by: Nipunn Koorapati <nipunn@xxxxxxxxxxx>
---
remote.c | 10 +++++++---
t/t5582-fetch-negative-refspec.sh | 15 +++++++++++++++
2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/remote.c b/remote.c
index 9f2450cb51b..cbb3113b105 100644
--- a/remote.c
+++ b/remote.c
@@ -751,9 +751,13 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
if (match_name_with_pattern(key, needle, value, &expn_name))
string_list_append_nodup(&reversed, expn_name);
- } else {
- if (!strcmp(needle, refspec->src))
- string_list_append(&reversed, refspec->src);
+ } else if (refspec->matching) {
+ /* For the special matching refspec, any query should match */
+ string_list_append(&reversed, needle);
+ } else if (refspec->src == NULL) {
+ BUG("refspec->src should not be null here");
+ } else if (!strcmp(needle, refspec->src)) {
+ string_list_append(&reversed, refspec->src);
}
}
diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh
index 8c61e28fec8..58b42fabd97 100755
--- a/t/t5582-fetch-negative-refspec.sh
+++ b/t/t5582-fetch-negative-refspec.sh
@@ -186,4 +186,19 @@ test_expect_success "fetch --prune with negative refspec" '
)
'
+test_expect_success "push with matching ':' refspec" '
+ (
+ cd two &&
+ git config remote.one.push : &&
+ # Fails w/ tip behind counterpart - but should not segfault
+ test_must_fail git push one master &&
+
+ git config remote.one.push +: &&
+ # Fails w/ tip behind counterpart - but should not segfault
+ test_must_fail git push one master &&
+
+ git config --unset remote.one.push
+ )
+'
+
test_done
--
gitgitgadget
