From: "René Scharfe" <l.s.r@web.de>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Jonathan Nieder <jrnieder@gmail.com>,
David Turner <dturner@twosigma.com>,
git@vger.kernel.org, Jeff King <peff@peff.net>,
Duy Nguyen <pclouds@gmail.com>
Subject: Re: [PATCH v3 1/2] use HOST_NAME_MAX to size buffers for gethostname(2)
Date: Thu, 20 Apr 2017 21:28:29 +0200 [thread overview]
Message-ID: <0882e8f6-f9e2-20c2-4e94-3fa8a50097c9@web.de> (raw)
In-Reply-To: <a718ca38-4c07-9f3d-e7f5-9efd7ef59007@web.de>
Am 20.04.2017 um 20:37 schrieb Torsten Bögershausen:
> On 2017-04-19 22:02, René Scharfe wrote:
>> Am 19.04.2017 um 21:09 schrieb Torsten Bögershausen:
>>> On 2017-04-19 19:28, René Scharfe wrote:
>>> []
>>> One or two minor comments inline
>>>> diff --git a/builtin/gc.c b/builtin/gc.c
>>>> index 2daede7820..4c1c01e87d 100644
>>>> --- a/builtin/gc.c
>>>> +++ b/builtin/gc.c
>>>> @@ -228,21 +228,99 @@ static int need_to_gc(void)
>>>> return 1;
>>>> }
>>>> +struct pidfile {
>>>> + struct strbuf buf;
>>>> + char *hostname;
>>>> +};
>>>> +
>>>> +#define PIDFILE_INIT { STRBUF_INIT }
>>>> +
>>>> +static void pidfile_release(struct pidfile *pf)
>>>> +{
>>>> + pf->hostname = NULL;
>>>> + strbuf_release(&pf->buf);
>>>> +}
>>>> +
>>>> +static int pidfile_read(struct pidfile *pf, const char *path,
>>>> + unsigned int max_age_seconds)
>>>> +{
>>>> + int fd;
>>>> + struct stat st;
>>>> + ssize_t len;
>>>> + char *space;
>>>> + int rc = -1;
>>>> +
>>>> + fd = open(path, O_RDONLY);
>>>> + if (fd < 0)
>>>> + return rc;
>>>> +
>>>> + if (fstat(fd, &st))
>>>> + goto out;
>>>> + if (time(NULL) - st.st_mtime > max_age_seconds)
>>>> + goto out;
>>>> + if (st.st_size > (size_t)st.st_size)
>>>
>>> Minor: we need xsize_t here ?
>>> if (st.st_size > xsize_t(st.st_size))
>>
>> No, xsize_t() would do the same check and die on overflow, and pidfile_read() is
>> supposed to handle big pids gracefully.
> This about the file size, isn't it ?
> And here xsize_t should be save to use and good practise.
I think I meant to write "big pidfiles" there.
With xsize_t() gc would die when seeing a pidfile whose size doesn't fit
into size_t. The version I sent just ignores such files. However, it
would choke on slightly smaller files that happen to not fit into
memory. And no reasonable pidfile can be big enough to trigger any of
that, so dying on conversion error wouldn't really be a problem. Is
that what you meant? It makes sense, in any case.
Thanks,
René
next prev parent reply other threads:[~2017-04-20 19:28 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-18 21:57 [PATCH v3 0/2] gethostbyname fixes David Turner
2017-04-18 21:57 ` [PATCH v3 1/2] use HOST_NAME_MAX to size buffers for gethostname(2) David Turner
2017-04-19 1:28 ` Jonathan Nieder
2017-04-19 2:57 ` Junio C Hamano
2017-04-19 14:03 ` René Scharfe
2017-04-19 17:28 ` René Scharfe
2017-04-19 19:08 ` David Turner
2017-04-19 19:09 ` Torsten Bögershausen
2017-04-19 20:02 ` René Scharfe
2017-04-20 18:37 ` Torsten Bögershausen
2017-04-20 19:28 ` René Scharfe [this message]
2017-04-21 4:18 ` Torsten Bögershausen
2017-04-18 21:57 ` [PATCH v3 2/2] xgethostname: handle long hostnames David Turner
2017-04-19 1:35 ` Jonathan Nieder
2017-04-19 2:51 ` Junio C Hamano
2017-04-19 15:50 ` David Turner
2017-04-19 16:43 ` René Scharfe
2017-04-19 2:48 ` 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=0882e8f6-f9e2-20c2-4e94-3fa8a50097c9@web.de \
--to=l.s.r@web.de \
--cc=dturner@twosigma.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=tboegi@web.de \
/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).