From: Rich Felker <dalias@libc.org>
To: musl@lists.openwall.com
Subject: Re: [PATCH] use dynamic buffer for getmntent
Date: Thu, 20 Oct 2016 01:25:27 -0400 [thread overview]
Message-ID: <20161020052527.GL19318@brightrain.aerifal.cx> (raw)
In-Reply-To: <20160908170731.30407-1-ncopa@alpinelinux.org>
On Thu, Sep 08, 2016 at 07:07:31PM +0200, Natanael Copa wrote:
> overlayfs may have fairly long lines so we use getline to allocate a
> buffer dynamically. The buffer will be allocated on first use, expand as
> needed, but will never be free'ed.
>
> Downstream bug: http://bugs.alpinelinux.org/issues/5703
>
> Signed-off-by: Natanael Copa <ncopa@alpinelinux.org>
Thanks! Sorry for the delay. Committed with minor style fixes:
> ---
> src/misc/mntent.c | 16 ++++++++++++----
> 1 file changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/src/misc/mntent.c b/src/misc/mntent.c
> index a16d652..722a030 100644
> --- a/src/misc/mntent.c
> +++ b/src/misc/mntent.c
> @@ -3,6 +3,11 @@
> #include <mntent.h>
> #include <errno.h>
>
> +static char *internal_buf = NULL;
> +static size_t internal_bufsize = 0;
Explicit zero initialization is not needed, and current/going-forward
style in musl is not to use the NULL macro but rather 0 or (T*)0 if
needed (e.g. for variadic args).
> +
> +#define SENTINEL (char *)&internal_buf
> +
> FILE *setmntent(const char *name, const char *mode)
> {
> return fopen(name, mode);
> @@ -16,13 +21,17 @@ int endmntent(FILE *f)
>
> struct mntent *getmntent_r(FILE *f, struct mntent *mnt, char *linebuf, int buflen)
> {
> - int cnt, n[8];
> + int cnt, n[8], use_internal = (linebuf == SENTINEL);
>
> mnt->mnt_freq = 0;
> mnt->mnt_passno = 0;
>
> do {
> - fgets(linebuf, buflen, f);
> + if (use_internal) {
> + getline(&internal_buf, &internal_bufsize, f);
> + linebuf = internal_buf;
> + } else
> + fgets(linebuf, buflen, f);
If if clause uses braces, else should too. There might be some
existing violations but I'm trying to make this consistent.
Rich
prev parent reply other threads:[~2016-10-20 5:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-08 17:07 Natanael Copa
2016-10-20 5:25 ` Rich Felker [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161020052527.GL19318@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.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://git.vuxu.org/mirror/musl/
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 NNTP newsgroup(s).