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 v4 0/3] sparse-checkout: fix segfault on malformed patterns
Date: Thu, 16 Dec 2021 16:13:39 +0000 [thread overview]
Message-ID: <pull.1069.v4.git.1639671222.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.1069.v3.git.1639575968.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
Update in v4
============
* For added precaution, this kind of unexpected duplicate pattern will
disable cone mode matching.
* Tests are updated to verify this new behavior.
Updates in v2 and v3
====================
* I intended to fix a typo in a patch, but accidentally sent the amend!
commit in v2
* v3 has the typo fix properly squashed in.
* Added Elijah's review.
Derrick Stolee (3):
sparse-checkout: fix segfault on malformed patterns
sparse-checkout: fix OOM error with mixed patterns
sparse-checkout: refuse to add to bad patterns
builtin/sparse-checkout.c | 5 +++-
dir.c | 6 ++---
t/t1091-sparse-checkout-builtin.sh | 37 +++++++++++++++++++++++++++++-
3 files changed, 42 insertions(+), 6 deletions(-)
base-commit: abe6bb3905392d5eb6b01fa6e54d7e784e0522aa
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1069%2Fderrickstolee%2Fsparse-checkout%2Finput-bug-v4
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1069/derrickstolee/sparse-checkout/input-bug-v4
Pull-Request: https://github.com/gitgitgadget/git/pull/1069
Range-diff vs v3:
1: 1744a26845f ! 1: 5353c541d9f sparse-checkout: fix segfault on malformed patterns
@@ Commit message
list' command because it iterates over the contents of the hashset, which is
now invalid.
- The fix here is to stop trying to remove from the hashset. Better to leave
- bad data in the sparse-checkout matching logic (with a warning) than to
- segfault. If we are in this state, then we are already traversing into
- undefined behavior, so this change to keep the entry in the hashset is no
- worse than removing it.
+ The fix here is to stop trying to remove from the hashset. In addition,
+ we disable cone mode sparse-checkout because of the malformed data. This
+ results in the pattern-matching working with a possibly-slower
+ algorithm, but using the patterns as they are in the sparse-checkout
+ file.
+
+ This also changes the behavior of commands such as 'git sparse-checkout
+ list' because the output patterns will be the contents of the
+ sparse-checkout file instead of the list of directories. This is an
+ existing behavior for other types of bad patterns.
Add a test that triggers the segfault without the code change.
@@ dir.c: static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_
- hashmap_remove(&pl->parent_hashmap, &translated->ent, &data);
- free(data);
- free(translated);
++ goto clear_hashmaps;
}
return;
@@ t/t1091-sparse-checkout-builtin.sh: test_expect_success 'cone mode clears ignore
+ !/foo/*/
+ /foo/\*/
+ EOF
-+ cat repo/.git/info/sparse-checkout &&
-+ git -C repo sparse-checkout list
++
++ # Listing the patterns will notice the duplicate pattern and
++ # emit a warning. It will list the patterns directly instead
++ # of using the cone-mode translation to a set of directories.
++ git -C repo sparse-checkout list >actual 2>err &&
++ test_cmp repo/.git/info/sparse-checkout actual &&
++ grep "warning: your sparse-checkout file may have issues: pattern .* is repeated" err &&
++ grep "warning: disabling cone pattern matching" err
+'
+
test_done
2: a2fe867222e = 2: 3fd625290a3 sparse-checkout: fix OOM error with mixed patterns
3: a0e5a942ae0 = 3: f5f7b8b8e04 sparse-checkout: refuse to add to bad patterns
--
gitgitgadget
next prev parent reply other threads:[~2021-12-16 16:13 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 ` [PATCH v2 0/4] " Derrick Stolee via GitGitGadget
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 ` Derrick Stolee via GitGitGadget [this message]
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
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=pull.1069.v4.git.1639671222.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.
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).