From: Junio C Hamano <gitster@pobox.com>
To: Mischa POSLAWSKY <git@shiar.nl>
Cc: git@vger.kernel.org, "Оля Тележная" <olyatelezhnaya@gmail.com>
Subject: Re: [PATCH] ref-filter: initialize empty name or email fields
Date: Tue, 20 Aug 2019 09:37:34 -0700 [thread overview]
Message-ID: <xmqq4l2bx06p.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <xmqqimqtxcou.fsf@gitster-ct.c.googlers.com> (Junio C. Hamano's message of "Mon, 19 Aug 2019 10:55:13 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Mischa POSLAWSKY <git@shiar.nl> writes:
>
>> Formatting $(taggername) on headerless tags such as v0.99 in Git
>> causes a SIGABRT with error "munmap_chunk(): invalid pointer",
>> because of an oversight in commit f0062d3b74 (ref-filter: free
>> item->value and item->value->s, 2018-10-19).
>>
>> Signed-off-by: Mischa POSLAWSKY <git@shiar.nl>
>> ---
>> If I understand correctly, such tags cannot be produced normally anymore.
>> Therefore I'm unsure how to make tests, and if that is even warranted.
>
> Thanks for spotting.
>
> I am not sure if the approach taken by this patch is the right one,
> though. I didn't follow the call/dataflow thoroughly, but if we
> replace unfree-able "" with NULL in these places, wouldn't
> fill_missing_values() take care of them?
I think replacing these "" with NULL would be safe, but there are
many places that return xstrdup("") from inside the callees of
populate_value(), so the patch presented here would be more
consistent with the current practice, I think.
So let's take the patch as is, at least for now. Thanks.
>> ref-filter.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/ref-filter.c b/ref-filter.c
>> index f27cfc8c3e..7338cfc671 100644
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>> @@ -1028,7 +1028,7 @@ static const char *copy_name(const char *buf)
>> if (!strncmp(cp, " <", 2))
>> return xmemdupz(buf, cp - buf);
>> }
>> - return "";
>> + return xstrdup("");
>> }
>>
>> static const char *copy_email(const char *buf)
>> @@ -1036,10 +1036,10 @@ static const char *copy_email(const char *buf)
>> const char *email = strchr(buf, '<');
>> const char *eoemail;
>> if (!email)
>> - return "";
>> + return xstrdup("");
>> eoemail = strchr(email, '>');
>> if (!eoemail)
>> - return "";
>> + return xstrdup("");
>> return xmemdupz(email, eoemail + 1 - email);
>> }
next prev parent reply other threads:[~2019-08-20 16:37 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-17 21:51 [PATCH] ref-filter: initialize empty name or email fields Mischa POSLAWSKY
2019-08-19 17:55 ` Junio C Hamano
2019-08-20 16:37 ` Junio C Hamano [this message]
2019-08-22 13:23 ` Mischa POSLAWSKY
2019-08-21 21:57 ` Junio C Hamano
2019-08-22 13:55 ` [PATCH 2/1] t6300: format missing tagger Mischa POSLAWSKY
2019-08-22 16:15 ` Junio C Hamano
2019-08-22 16:27 ` Mischa POSLAWSKY
2019-08-22 18:05 ` 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=xmqq4l2bx06p.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@shiar.nl \
--cc=git@vger.kernel.org \
--cc=olyatelezhnaya@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).