mbox series

[0/3] sparse-checkout: fix segfault on malformed patterns

Message ID pull.1069.git.1638907336.gitgitgadget@gmail.com (mailing list archive)
Headers show
Series sparse-checkout: fix segfault on malformed patterns | expand

Message

Philippe Blain via GitGitGadget Dec. 7, 2021, 8:02 p.m. UTC
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 (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                              |  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-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1069/derrickstolee/sparse-checkout/input-bug-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1069

Comments

Elijah Newren Dec. 7, 2021, 9:51 p.m. UTC | #1
On Tue, Dec 7, 2021 at 12:02 PM Derrick Stolee via GitGitGadget
<gitgitgadget@gmail.com> wrote:
>
> 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.

I was only able to find what I think is a small typo in one of the
commits.  Everything else looks good to me.

> 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

Sorry for missing that series earlier.  Glad we've got some of them now.

> --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 (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                              |  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-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1069/derrickstolee/sparse-checkout/input-bug-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/1069
> --
> gitgitgadget
Derrick Stolee Dec. 8, 2021, 2:23 p.m. UTC | #2
On 12/7/2021 4:51 PM, Elijah Newren wrote:
> On Tue, Dec 7, 2021 at 12:02 PM Derrick Stolee via GitGitGadget
> <gitgitgadget@gmail.com> wrote:
>>
>> 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.
> 
> I was only able to find what I think is a small typo in one of the
> commits.  Everything else looks good to me.

Thanks. I'll give this a few more days for more feedback before sending
a v2 with that fix.
 
>> 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
> 
> Sorry for missing that series earlier.  Glad we've got some of them now.

The fault was my own for dropping this during a particularly busy time.

Thanks,
-Stolee