From: Eric Sunshine <sunshine@sunshineco.com>
To: Nipunn Koorapati via GitGitGadget <gitgitgadget@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Nipunn Koorapati <nipunn1313@gmail.com>,
Nipunn Koorapati <nipunn@dropbox.com>
Subject: Re: [PATCH v2 1/2] negative-refspec: fix segfault on : refspec
Date: Sat, 19 Dec 2020 21:57:35 -0500 [thread overview]
Message-ID: <CAPig+cTBn6fPgkjaf=fYXi4XrHqc5Kf-ZJiMhxvdCDsMBuLTDQ@mail.gmail.com> (raw)
In-Reply-To: <e42200b644adab3ad78bf23e0258466287dbae70.1608415117.git.gitgitgadget@gmail.com>
On Sat, Dec 19, 2020 at 5:00 PM Nipunn Koorapati via GitGitGadget
<gitgitgadget@gmail.com> wrote:
> 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
A couple minor comments below...
> Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
> ---
> diff --git a/remote.c b/remote.c
> @@ -751,9 +751,13 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
> + } 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");
I realize that you copied Junio's example, but style on this project
is to write this as:
} else if (!refspec->src) {
...
> diff --git 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
> + )
> +'
If anything in this test fails prior to the final `git config
--unset`, then that cleanup command won't be executed, which might
negatively impact tests which follow. To ensure cleanup whether the
test succeeds or fails, use test_config(). Unfortunately,
test_config() has the limitation that it can't be used in subshells,
so you may have to restructure the test a bit, perhaps like this:
test_config remote.one.push : &&
(
cd two &&
test_must_fail git push one master &&
git config remote.one.push +: &&
test_must_fail git push one master
)
Driving the test with a for-loop and taking advantage of -C to avoid
the subshell is also an option:
for v in : +:
do
test_config -C two remote.one.push $v &&
test_must_fail git -C two push one master || return 1
done
next prev parent reply other threads:[~2020-12-20 3:01 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-19 17:23 [PATCH] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-19 18:05 ` Junio C Hamano
2021-02-19 9:28 ` Jacob Keller
2020-12-19 21:58 ` [PATCH v2 0/2] " Nipunn Koorapati via GitGitGadget
2020-12-19 21:58 ` [PATCH v2 1/2] " Nipunn Koorapati via GitGitGadget
2020-12-20 2:57 ` Eric Sunshine [this message]
2020-12-19 21:58 ` [PATCH v2 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-21 2:05 ` [PATCH v3 0/3] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-21 2:05 ` [PATCH v3 1/3] test-lib-functions: handle --add in test_config Nipunn Koorapati via GitGitGadget
2020-12-21 7:07 ` Eric Sunshine
2020-12-21 19:00 ` Junio C Hamano
2020-12-21 20:08 ` Eric Sunshine
2020-12-22 0:00 ` Nipunn Koorapati
2020-12-22 0:13 ` Eric Sunshine
2020-12-22 2:25 ` Nipunn Koorapati
2020-12-22 5:19 ` Eric Sunshine
2020-12-21 2:05 ` [PATCH v3 2/3] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-21 7:20 ` Eric Sunshine
2020-12-21 2:05 ` [PATCH v3 3/3] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 1:11 ` [PATCH v4 0/2] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-22 1:11 ` [PATCH v4 1/2] " Nipunn Koorapati via GitGitGadget
2020-12-22 2:08 ` Junio C Hamano
2020-12-22 2:28 ` Junio C Hamano
2020-12-22 1:11 ` [PATCH v4 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 3:58 ` [PATCH v5 0/2] negative-refspec: fix segfault on : refspec Nipunn Koorapati via GitGitGadget
2020-12-22 3:58 ` [PATCH v5 1/2] " Nipunn Koorapati via GitGitGadget
2021-02-19 9:32 ` Jacob Keller
2020-12-22 3:58 ` [PATCH v5 2/2] negative-refspec: improve comment on query_matches_negative_refspec Nipunn Koorapati via GitGitGadget
2020-12-22 6:48 ` [PATCH v5 0/2] negative-refspec: fix segfault on : refspec Junio C Hamano
2020-12-23 23:56 ` Nipunn Koorapati
2020-12-24 0:00 ` Junio C Hamano
2021-01-11 20:22 ` Nipunn Koorapati
2021-01-12 2:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPig+cTBn6fPgkjaf=fYXi4XrHqc5Kf-ZJiMhxvdCDsMBuLTDQ@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=nipunn1313@gmail.com \
--cc=nipunn@dropbox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).