From: "Martin Ågren" <martin.agren@gmail.com>
To: Michael Haggerty <mhagger@alum.mit.edu>
Cc: Git Mailing List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH v2 2/2] refs/files-backend: fix memory leak in lock_ref_for_update
Date: Tue, 29 Aug 2017 12:41:49 +0200 [thread overview]
Message-ID: <CAN0heSqn59sFF3A-eQ593G+ZDWnO9pKM5F=sgiSQk+prUr-nSQ@mail.gmail.com> (raw)
In-Reply-To: <425e16e7-188e-ecff-3a09-228ef1dcf319@alum.mit.edu>
On 29 August 2017 at 10:39, Michael Haggerty <mhagger@alum.mit.edu> wrote:
> On 08/28/2017 10:32 PM, Martin Ågren wrote:
>> After the previous patch, none of the functions we call hold on to
>> `referent.buf`, so we can safely release the string buffer before
>> returning.
>
> This patch looks good to me, but I did notice a pre-existing problem in
> the area...
>
>> ---
>> refs/files-backend.c | 31 ++++++++++++++++++++-----------
>> 1 file changed, 20 insertions(+), 11 deletions(-)
>>
>> diff --git a/refs/files-backend.c b/refs/files-backend.c
>> index bdb0e22e5..15f34b10e 100644
>> --- a/refs/files-backend.c
>> +++ b/refs/files-backend.c
>> [...]
>> @@ -2305,10 +2305,12 @@ static int lock_ref_for_update(struct files_ref_store *refs,
>> strbuf_addf(err, "cannot lock ref '%s': "
>> "error reading reference",
>> original_update_refname(update));
>> - return -1;
>> + ret = -1;
>> + goto out;
>
> It is incorrect to return -1 here. First of all, stylistically, the
> return value should be a symbolic constant. But in fact, it should be
> returning `TRANSACTION_GENERIC_ERROR` here, whereas -1 is
> `TRANSACTION_NAME_CONFLICT`. So the code is not just stylistically
> wrong; it is functionally wrong.
>
> I know that this is not your mistake, but would you like to add another
> patch to your series to fix this up? I'd do it myself, but it's a little
> bit awkward because the fix will conflict with your patch.
Sure. I'll send out a v3 later today. I'll fix this in a third patch,
and I'll also address your comments on the first patch.
Thanks a lot.
Martin
next prev parent reply other threads:[~2017-08-29 10:41 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-25 18:49 [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames Martin Ågren
2017-08-25 18:49 ` [PATCH 2/2] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-08-25 21:00 ` [PATCH 1/2] refs/files-backend: duplicate strings added to affected_refnames Junio C Hamano
2017-08-26 10:16 ` Martin Ågren
2017-08-28 8:06 ` Michael Haggerty
2017-08-28 10:09 ` Martin Ågren
2017-08-28 20:32 ` [PATCH v2 1/2] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-08-29 8:33 ` Michael Haggerty
2017-08-28 20:32 ` [PATCH v2 2/2] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-08-29 8:39 ` Michael Haggerty
2017-08-29 10:41 ` Martin Ågren [this message]
2017-08-29 17:18 ` [PATCH v3 1/3] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-08-30 2:52 ` Michael Haggerty
2017-08-30 18:02 ` Martin Ågren
2017-09-05 10:02 ` Junio C Hamano
2017-09-05 17:24 ` Martin Ågren
2017-09-05 20:36 ` Jeff King
2017-09-05 21:26 ` Junio C Hamano
2017-09-06 18:12 ` Martin Ågren
2017-09-06 19:52 ` Junio C Hamano
2017-09-06 23:45 ` Jeff King
2017-09-09 6:57 ` [PATCH v4 0/4] Rerolling ma/split-symref-update-fix Martin Ågren
2017-09-09 6:57 ` [PATCH v4 1/4] refs/files-backend: add longer-scoped copy of string to list Martin Ågren
2017-09-09 6:57 ` [PATCH v4 2/4] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-09-09 6:57 ` [PATCH v4 3/4] refs/files-backend: correct return value " Martin Ågren
2017-09-09 6:57 ` [PATCH v4 4/4] refs/files-backend: add `refname`, not "HEAD", to list Martin Ågren
2017-09-09 10:47 ` [PATCH v4 0/4] Rerolling ma/split-symref-update-fix Jeff King
2017-09-05 8:45 ` [PATCH v3 1/3] refs/files-backend: add longer-scoped copy of string to list Jeff King
2017-09-05 9:03 ` Michael Haggerty
2017-09-05 9:04 ` Jeff King
2017-08-29 17:18 ` [PATCH v3 2/3] refs/files-backend: fix memory leak in lock_ref_for_update Martin Ågren
2017-09-05 8:47 ` Jeff King
2017-09-05 17:28 ` Martin Ågren
2017-08-29 17:18 ` [PATCH v3 3/3] refs/files-backend: correct return value " Martin Ågren
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='CAN0heSqn59sFF3A-eQ593G+ZDWnO9pKM5F=sgiSQk+prUr-nSQ@mail.gmail.com' \
--to=martin.agren@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mhagger@alum.mit.edu \
/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).