From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: git@vger.kernel.org, Michael Haggerty <mhagger@alum.mit.edu>,
"brian m. carlson" <sandals@crustytoothpaste.ath.cx>
Subject: Re: [PATCH] refs: make sure we never pass NULL to hashcpy
Date: Wed, 06 Sep 2017 10:26:31 +0900 [thread overview]
Message-ID: <xmqqh8wgaa7s.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: 20170904200504.15249-1-t.gummerer@gmail.com
Thomas Gummerer <t.gummerer@gmail.com> writes:
> gcc on arch linux (version 7.1.1) warns that a NULL argument is passed
> as the second parameter of memcpy.
>
> In file included from refs.c:5:0:
> refs.c: In function ‘ref_transaction_verify’:
> cache.h:948:2: error: argument 2 null where non-null expected [-Werror=nonnull]
> memcpy(sha_dst, sha_src, GIT_SHA1_RAWSZ);
> ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> In file included from git-compat-util.h:165:0,
> from cache.h:4,
> from refs.c:5:
> /usr/include/string.h:43:14: note: in a call to function ‘memcpy’ declared here
> extern void *memcpy (void *__restrict __dest, const void *__restrict __src,
> ^~~~~~
> ...
> diff --git a/refs.c b/refs.c
> index ba22f4acef..d8c12a9c44 100644
> --- a/refs.c
> +++ b/refs.c
> @@ -896,10 +896,14 @@ struct ref_update *ref_transaction_add_update(
>
> update->flags = flags;
>
> - if (flags & REF_HAVE_NEW)
> + if (flags & REF_HAVE_NEW) {
> + assert(new_sha1);
> hashcpy(update->new_oid.hash, new_sha1);
> - if (flags & REF_HAVE_OLD)
> + }
> + if (flags & REF_HAVE_OLD) {
> + assert(old_sha1);
> hashcpy(update->old_oid.hash, old_sha1);
> + }
It is hugely annoying to see a halfway-intelligent compiler forces
you to add such pointless asserts.
The only way the compiler could error on this is by inferring the
fact that new_sha1/old_sha1 could be NULL by looking at the callsite
in ref_transaction_update() where these are used as conditionals to
set HAVE_NEW/HAVE_OLD that are passed. Even if the compiler were
doing the whole-program analysis, the other two callsites of the
function pass the address of oid.hash[] in an oid structure so it
should know these won't be NULL.
Or is the compiler being really dumb and triggering an error for
every use of
memcpy(dst, src, size);
that must now be written as
assert(src);
memcpy(dst, src, size);
??? That would be doubly annoying.
I wonder if REF_HAVE_NEW/REF_HAVE_OLD are really needed in these
codepaths, though. Perhaps we can instead declare !!new_sha1 means
we have the new side and rewrite the above part to
if (new_sha1)
hashcpy(update->new_oid.hash, new_sha1);
without an extra and totally pointless assert()?
> update->msg = xstrdup_or_null(msg);
> return update;
> }
next prev parent reply other threads:[~2017-09-06 1:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-04 20:05 [PATCH] refs: make sure we never pass NULL to hashcpy Thomas Gummerer
2017-09-06 1:26 ` Junio C Hamano [this message]
2017-09-06 20:32 ` Thomas Gummerer
2017-09-07 7:26 ` Michael Haggerty
2017-09-07 20:39 ` Thomas Gummerer
2017-09-08 0:46 ` Junio C Hamano
2017-09-08 15:08 ` Michael Haggerty
2017-09-08 17:15 ` Junio C Hamano
2017-09-12 22:59 ` [RFC v2] refs: strip out not allowed flags from ref_transaction_update Thomas Gummerer
2017-09-21 8:40 ` Michael Haggerty
2017-09-22 4:23 ` Junio C Hamano
2017-09-24 20:45 ` Thomas Gummerer
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=xmqqh8wgaa7s.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=mhagger@alum.mit.edu \
--cc=sandals@crustytoothpaste.ath.cx \
--cc=t.gummerer@gmail.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).