From: Elijah Newren <newren@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, Elijah Newren <newren@gmail.com>
Subject: [PATCHv2 0/2] Fix rerere segfault with specially crafted merge
Date: Tue, 11 Sep 2018 11:55:44 -0700 [thread overview]
Message-ID: <20180911185546.10449-1-newren@gmail.com> (raw)
In-Reply-To: <20180905175605.12341-1-newren@gmail.com>
This series documents and fixes a rerere segfault (dating back to
git-2.7.0) when a merge strategy makes the last entry in the index be
at stage 1.
Changes since last version:
- In my last submission I only had the code fix and no testcase; I
even commented in the commit message that the bug "cannot be
triggered in the current codebase" and mentioned that I was fixing
it just because an exotic external merge strategy could trigger
the bug. I realized later that it is triggerable without any
exotic external merge strategies; built-in ones can do it.
Elijah Newren (2):
t4200: demonstrate rerere segfault on specially crafted merge
rerere: avoid buffer overrun
rerere.c | 2 +-
t/t4200-rerere.sh | 29 +++++++++++++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
--
2.19.0.2.gdbd064c81f
next prev parent reply other threads:[~2018-09-11 18:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 17:56 [PATCH] rerere: avoid buffer overrun Elijah Newren
2018-09-11 18:55 ` Elijah Newren [this message]
2018-09-11 18:55 ` [PATCHv2 1/2] t4200: demonstrate rerere segfault on specially crafted merge Elijah Newren
2018-09-11 18:55 ` [PATCHv2 2/2] rerere: avoid buffer overrun Elijah Newren
2018-09-11 20:45 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180911185546.10449-1-newren@gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).