From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Jens Lehmann <Jens.Lehmann@web.de>,
John Keeping <john@keeping.me.uk>,
Guillaume Gelin <contact@ramnes.eu>
Subject: Re: [PATCH] mv: prevent mismatched data when ignoring errors.
Date: Tue, 11 Mar 2014 14:45:59 -0700 [thread overview]
Message-ID: <xmqqfvmoo1d4.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1394306499-50871-1-git-send-email-sandals@crustytoothpaste.net> (brian m. carlson's message of "Sat, 8 Mar 2014 19:21:39 +0000")
"brian m. carlson" <sandals@crustytoothpaste.net> writes:
> We shrink the source and destination arrays, but not the modes or
> submodule_gitfile arrays, resulting in potentially mismatched data. Shrink
> all the arrays at the same time to prevent this.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> builtin/mv.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index f99c91e..b20cd95 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -230,6 +230,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
> memmove(destination + i,
> destination + i + 1,
> (argc - i) * sizeof(char *));
> + memmove(modes + i, modes + i + 1,
> + (argc - i) * sizeof(char *));
> + memmove(submodule_gitfile + i,
> + submodule_gitfile + i + 1,
> + (argc - i) * sizeof(char *));
> i--;
> }
> } else
Thanks. Neither this nor John's seems to describe the user-visible
way to trigger the symptom. Can we have tests for them?
next prev parent reply other threads:[~2014-03-11 21:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-08 16:23 git 1.9.0 segfault Guillaume Gelin
2014-03-08 16:46 ` brian m. carlson
2014-03-08 18:12 ` John Keeping
2014-03-08 18:35 ` [PATCH] builtin/mv: fix out of bounds write John Keeping
2014-03-08 19:15 ` brian m. carlson
2014-03-08 19:29 ` [PATCH v2] " John Keeping
2014-03-08 19:21 ` [PATCH] mv: prevent mismatched data when ignoring errors brian m. carlson
2014-03-11 1:56 ` Jeff King
2014-03-11 2:00 ` brian m. carlson
2014-03-11 21:45 ` Junio C Hamano [this message]
2014-03-12 23:21 ` brian m. carlson
2014-03-15 16:05 ` Thomas Rast
2014-03-16 2:00 ` Jeff King
2014-03-16 21:20 ` Junio C Hamano
2014-03-17 6:33 ` Junio C Hamano
2014-03-17 15:07 ` Michael Haggerty
2014-03-17 19:06 ` Eric Sunshine
2014-03-17 22:04 ` Jeff King
2014-03-18 22:31 ` Junio C Hamano
2014-03-15 18:56 ` [PATCH v2] " brian m. carlson
2014-03-16 2:00 ` Jeff King
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=xmqqfvmoo1d4.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Jens.Lehmann@web.de \
--cc=contact@ramnes.eu \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=sandals@crustytoothpaste.net \
/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.