From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: me@ttaylorr.com, newren@gmail.com, vdye@github.com,
Derrick Stolee <stolee@gmail.com>,
Derrick Stolee <derrickstolee@github.com>
Subject: [PATCH v2 0/4] sparse-checkout: fix segfault on malformed patterns
Date: Fri, 10 Dec 2021 15:18:07 +0000 [thread overview]
Message-ID: <pull.1069.v2.git.1639149490.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1069.git.1638907336.gitgitgadget@gmail.com>
This series fixes some issues with parsing sparse-checkout patterns when
core.sparseCheckoutCone is enabled but the sparse-checkout file itself
contains patterns that don't match the cone mode format.
The first patch fixes a segfault first reported in [1]. The other two
patches are from an earlier submission [2] that never got picked up and I
lost track of. There was another patch involving 'git sparse-checkout init
--cone' that isn't necessary, especially with Elijah doing some work in that
space right now.
[1] https://github.com/git-for-windows/git/issues/3498 [2]
https://lore.kernel.org/git/pull.1043.git.1632160658.gitgitgadget@gmail.com
Thanks, -Stolee
Derrick Stolee (4):
sparse-checkout: fix segfault on malformed patterns
sparse-checkout: fix OOM error with mixed patterns
sparse-checkout: refuse to add to bad patterns
amend! sparse-checkout: fix segfault on malformed patterns
builtin/sparse-checkout.c | 5 ++++-
dir.c | 5 +----
t/t1091-sparse-checkout-builtin.sh | 31 +++++++++++++++++++++++++++++-
3 files changed, 35 insertions(+), 6 deletions(-)
base-commit: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1069%2Fderrickstolee%2Fsparse-checkout%2Finput-bug-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1069/derrickstolee/sparse-checkout/input-bug-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/1069
Range-diff vs v1:
1: becbee16d2e ! 1: a0e3dd335c9 sparse-checkout: fix segfault on malformed patterns
@@ Commit message
Add a test that triggers the segfault without the code change.
Reported-by: John Burnett <johnburnett@johnburnett.com>
+ Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
## dir.c ##
2: 239bf23eacb ! 2: 86fbf130c03 sparse-checkout: fix OOM error with mixed patterns
@@ Commit message
Reported-by: Calbabreaker <calbabreaker@gmail.com>
Helped-by: Taylor Blau <me@ttaylorr.com>
+ Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
## builtin/sparse-checkout.c ##
3: cc52fb2b0b7 ! 3: 5d096e380a4 sparse-checkout: refuse to add to bad patterns
@@ Commit message
because of a test that adds non-cone mode patterns without cleaning them
up. Perform that cleanup as part of the test now.
+ Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
## builtin/sparse-checkout.c ##
-: ----------- > 4: 7bacb3760f3 amend! sparse-checkout: fix segfault on malformed patterns
--
gitgitgadget
next prev parent reply other threads:[~2021-12-10 15:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-07 20:02 [PATCH 0/3] sparse-checkout: fix segfault on malformed patterns Derrick Stolee via GitGitGadget
2021-12-07 20:02 ` [PATCH 1/3] " Derrick Stolee via GitGitGadget
2021-12-07 20:22 ` Elijah Newren
2021-12-07 20:02 ` [PATCH 2/3] sparse-checkout: fix OOM error with mixed patterns Derrick Stolee via GitGitGadget
2021-12-07 20:02 ` [PATCH 3/3] sparse-checkout: refuse to add to bad patterns Derrick Stolee via GitGitGadget
2021-12-07 21:51 ` [PATCH 0/3] sparse-checkout: fix segfault on malformed patterns Elijah Newren
2021-12-08 14:23 ` Derrick Stolee
2021-12-10 15:18 ` Derrick Stolee via GitGitGadget [this message]
2021-12-10 15:18 ` [PATCH v2 1/4] " Derrick Stolee via GitGitGadget
2021-12-10 15:18 ` [PATCH v2 2/4] sparse-checkout: fix OOM error with mixed patterns Derrick Stolee via GitGitGadget
2021-12-10 15:18 ` [PATCH v2 3/4] sparse-checkout: refuse to add to bad patterns Derrick Stolee via GitGitGadget
2021-12-15 13:46 ` [PATCH v3 0/3] sparse-checkout: fix segfault on malformed patterns Derrick Stolee via GitGitGadget
2021-12-15 13:46 ` [PATCH v3 1/3] " Derrick Stolee via GitGitGadget
2021-12-15 20:56 ` Junio C Hamano
2021-12-16 14:23 ` Derrick Stolee
2021-12-15 13:46 ` [PATCH v3 2/3] sparse-checkout: fix OOM error with mixed patterns Derrick Stolee via GitGitGadget
2021-12-15 13:46 ` [PATCH v3 3/3] sparse-checkout: refuse to add to bad patterns Derrick Stolee via GitGitGadget
2021-12-15 20:43 ` [PATCH v3 0/3] sparse-checkout: fix segfault on malformed patterns Junio C Hamano
2021-12-16 14:24 ` Derrick Stolee
2021-12-16 19:16 ` Junio C Hamano
2021-12-16 16:13 ` [PATCH v4 " Derrick Stolee via GitGitGadget
2021-12-16 16:13 ` [PATCH v4 1/3] " Derrick Stolee via GitGitGadget
2021-12-16 16:13 ` [PATCH v4 2/3] sparse-checkout: fix OOM error with mixed patterns Derrick Stolee via GitGitGadget
2021-12-16 16:13 ` [PATCH v4 3/3] sparse-checkout: refuse to add to bad patterns Derrick Stolee via GitGitGadget
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.1069.v2.git.1639149490.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=derrickstolee@github.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=newren@gmail.com \
--cc=stolee@gmail.com \
--cc=vdye@github.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.