From: Mark Wielaard <mark@klomp.org>
To: Florian Weimer <fweimer@redhat.com>
Cc: elfutils-devel@sourceware.org,
Panu Matilainen <pmatilai@laiskiainen.org>
Subject: Re: [PATCH] elfclassify tool
Date: Mon, 29 Jul 2019 14:34:00 -0000 [thread overview]
Message-ID: <20190729143441.GC2881@wildebeest.org> (raw)
In-Reply-To: <87a7cx6w0g.fsf@oldenburg2.str.redhat.com>
On Mon, Jul 29, 2019 at 11:16:31AM +0200, Florian Weimer wrote:
> * Mark Wielaard:
>
> > +/* Called to process standard input if flag_stdin is not no_stdin. */
> > +static void
> > +process_stdin (int *status)
> > +{
> > + char delim;
> > + if (flag_stdin == do_stdin0)
> > + delim = '\0';
> > + else
> > + delim = '\n';
> > +
> > + char *buffer = NULL;
> > + size_t buffer_size = 0;
> > + while (true)
> > + {
> > + ssize_t ret = getdelim (&buffer, &buffer_size, delim, stdin);
> > + if (ferror (stdin))
> > + {
> > + current_path = NULL;
> > + issue (errno, N_("reading from standard input"));
> > + break;
> > + }
> > + if (feof (stdin))
> > + break;
> > + if (ret < 0)
> > + abort (); /* Cannot happen due to error checks above. */
> > + if (delim != '\0' && ret > 0)
> > + buffer[ret - 1] = '\0';
>
> I think this can overwrite the last character of the last line if the
> file does not end with '\n'.
I see. "The buffer is null-terminated and includes the newline
character, if one was found."
So the test should be:
diff --git a/src/elfclassify.c b/src/elfclassify.c
index ebd42c1d5..b17d14d45 100644
--- a/src/elfclassify.c
+++ b/src/elfclassify.c
@@ -862,7 +862,7 @@ process_stdin (int *status)
break;
if (ret < 0)
abort (); /* Cannot happen due to error checks above. */
- if (delim != '\0' && ret > 0)
+ if (delim != '\0' && ret > 0 && buffer[ret - 1] == '\n')
buffer[ret - 1] = '\0';
current_path = buffer;
process_current_path (status);
Thanks,
Mark
next prev parent reply other threads:[~2019-07-29 14:34 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-12 15:38 Florian Weimer
2019-04-15 15:39 ` Mark Wielaard
2019-04-16 11:38 ` Florian Weimer
2019-04-18 11:17 ` Florian Weimer
2019-07-19 12:47 ` Mark Wielaard
2019-07-19 13:43 ` Dmitry V. Levin
2019-07-19 14:21 ` Mark
2019-07-19 18:35 ` Dmitry V. Levin
2019-07-19 21:00 ` Florian Weimer
2019-07-19 21:23 ` Dmitry V. Levin
2019-07-19 21:36 ` Mark Wielaard
2019-07-19 22:57 ` Dmitry V. Levin
2019-07-20 21:51 ` Mark Wielaard
2019-07-25 22:39 ` [PATCH] elfclassify: Add --library classification Mark Wielaard
2019-07-26 22:53 ` Dmitry V. Levin
2019-07-26 23:04 ` [PATCH] elfclassify tool Dmitry V. Levin
2019-07-27 11:54 ` Mark Wielaard
2019-07-20 21:40 ` Mark Wielaard
2019-07-22 15:55 ` Florian Weimer
2019-07-26 22:11 ` Mark Wielaard
2019-07-29 8:44 ` Florian Weimer
2019-07-29 14:24 ` Mark Wielaard
2019-08-11 23:38 ` Mark Wielaard
2019-08-12 8:14 ` Florian Weimer
2019-08-12 15:18 ` Mark Wielaard
2019-07-29 9:16 ` Florian Weimer
2019-07-29 14:34 ` Mark Wielaard [this message]
2019-07-29 14:38 ` Florian Weimer
2019-08-13 9:44 ` Mark Wielaard
2019-08-13 11:42 ` Mark Wielaard
2019-08-14 20:46 ` [PATCH] config/elfutils.spec.in: package eu-elfclassify Dmitry V. Levin
2019-08-15 7:33 ` Mark Wielaard
2019-07-29 9:22 ` [PATCH] elfclassify tool Florian Weimer
2019-07-29 14:40 ` Mark Wielaard
2019-07-29 14:42 ` Florian Weimer
2019-07-19 13:24 ` Mark Wielaard
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=20190729143441.GC2881@wildebeest.org \
--to=mark@klomp.org \
--cc=elfutils-devel@sourceware.org \
--cc=fweimer@redhat.com \
--cc=pmatilai@laiskiainen.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.
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).