From: "René Scharfe" <l.s.r@web.de>
To: "Martin Liška" <mliska@suse.cz>, "Jeff King" <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] Fix nonnull errors reported by UBSAN with GCC 7.
Date: Thu, 6 Apr 2017 14:26:55 +0200 [thread overview]
Message-ID: <33c63fb9-281c-8fd2-66e7-b85f62f4f447@web.de> (raw)
In-Reply-To: <998bf391-7fc5-8329-db58-ef0f24517707@suse.cz>
Am 06.04.2017 um 11:52 schrieb Martin Liška:
> I'm sending (v2), where I updated commit message and wrapped 2 problematic
> places to newly introduced macros that do the check. Follow-up patch can
> change usages of memcpy and memove.
> diff --git a/apply.c b/apply.c
> index e6dbab26a..eacca29fa 100644
> --- a/apply.c
> +++ b/apply.c
> @@ -2802,9 +2802,9 @@ static void update_image(struct apply_state *state,
> img->line + applied_pos + preimage_limit,
> (img->nr - (applied_pos + preimage_limit)) *
> sizeof(*img->line));
> - memcpy(img->line + applied_pos,
> - postimage->line,
> - postimage->nr * sizeof(*img->line));
> + MEMCPY(img->line + applied_pos,
> + postimage->line,
> + postimage->nr * sizeof(*img->line));
Using the existing macro COPY_ARRAY would yield a nicer result:
COPY_ARRAY(img->line + applied_pos, postimage->line, postimage->nr);
> if (!state->allow_overlap)
> for (i = 0; i < postimage->nr; i++)
> img->line[applied_pos + i].flag |= LINE_PATCHED;
> diff --git a/builtin/ls-files.c b/builtin/ls-files.c
> index d449e46db..7caeeb6a6 100644
> --- a/builtin/ls-files.c
> +++ b/builtin/ls-files.c
> @@ -391,7 +391,7 @@ static void prune_cache(const char *prefix, size_t prefixlen)
> }
> last = next;
> }
> - memmove(active_cache, active_cache + pos,
> + MEMMOVE(active_cache, active_cache + pos,
> (last - pos) * sizeof(struct cache_entry *));
> active_nr = last - pos;
> }
Perhaps we should add MOVE_ARRAY to complement COPY_ARRAY.
René
next prev parent reply other threads:[~2017-04-06 12:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-06 8:02 [PATCH 1/2] Fix nonnull errors reported by UBSAN with GCC 7 Martin Liška
2017-04-06 8:34 ` Jeff King
2017-04-06 9:52 ` [PATCH v2 " Martin Liška
2017-04-06 12:26 ` René Scharfe [this message]
2017-04-06 15:42 ` [PATCH v3 " Martin Liška
2017-04-06 16:33 ` Johannes Sixt
2017-04-06 17:31 ` René Scharfe
2017-04-06 20:49 ` Johannes Sixt
2017-04-07 14:23 ` Martin Liška
2017-04-07 15:25 ` René Scharfe
2017-04-07 15:25 ` [PATCH 1/2] add MOVE_ARRAY René Scharfe
2017-04-07 15:25 ` [PATCH 2/2] use MOVE_ARRAY René Scharfe
2017-04-17 1:49 ` [PATCH v3 1/2] Fix nonnull errors reported by UBSAN with GCC 7 Junio C Hamano
2017-04-17 7:59 ` Johannes Sixt
2017-04-06 8:57 ` [PATCH " Johannes Schindelin
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=33c63fb9-281c-8fd2-66e7-b85f62f4f447@web.de \
--to=l.s.r@web.de \
--cc=git@vger.kernel.org \
--cc=mliska@suse.cz \
--cc=peff@peff.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.
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).