From: Johan Herland <johan@herland.net>
To: carenas@gmail.com
Cc: Git mailing list <git@vger.kernel.org>
Subject: Re: [PATCH] builtin/notes: remove unnecessary free
Date: Sun, 11 Nov 2018 11:41:02 +0100 [thread overview]
Message-ID: <CALKQrgdCNxXSOG-KRUeNaw2q=hOGh9+-zM5ATHwmDEmOC7UAcw@mail.gmail.com> (raw)
In-Reply-To: <20181111094933.27325-1-carenas@gmail.com>
On Sun, Nov 11, 2018 at 10:49 AM Carlo Marcelo Arenas Belón
<carenas@gmail.com> wrote:
>
> 511726e4b1 ("builtin/notes: fix premature failure when trying to add
> the empty blob", 2014-11-09) removed the check for !len but left a
> call to free the buffer that will be otherwise NULL
>
> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Johan Herland <johan@herland.net>
> ---
> builtin/notes.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/builtin/notes.c b/builtin/notes.c
> index c05cd004ab..68062f7475 100644
> --- a/builtin/notes.c
> +++ b/builtin/notes.c
> @@ -255,10 +255,8 @@ static int parse_reuse_arg(const struct option *opt, const char *arg, int unset)
>
> if (get_oid(arg, &object))
> die(_("failed to resolve '%s' as a valid ref."), arg);
> - if (!(buf = read_object_file(&object, &type, &len))) {
> - free(buf);
> + if (!(buf = read_object_file(&object, &type, &len)))
> die(_("failed to read object '%s'."), arg);
> - }
> if (type != OBJ_BLOB) {
> free(buf);
> die(_("cannot read note data from non-blob object '%s'."), arg);
> --
> 2.19.1.856.g8858448bb
>
--
Johan Herland, <johan@herland.net>
www.herland.net
next prev parent reply other threads:[~2018-11-11 10:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-11 9:49 [PATCH] builtin/notes: remove unnecessary free Carlo Marcelo Arenas Belón
2018-11-11 10:41 ` Johan Herland [this message]
2018-11-13 1:29 ` 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
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='CALKQrgdCNxXSOG-KRUeNaw2q=hOGh9+-zM5ATHwmDEmOC7UAcw@mail.gmail.com' \
--to=johan@herland.net \
--cc=carenas@gmail.com \
--cc=git@vger.kernel.org \
/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).