From: Joe Simmons-Talbott <josimmon@redhat.com>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH v2] fileops: Don't process ,ccs= as individual mode flags (BZ#18906)
Date: Wed, 5 Jul 2023 14:18:16 -0400 [thread overview]
Message-ID: <20230705181816.GA6392@oak> (raw)
In-Reply-To: <20230615171243.4173020-1-josimmon@redhat.com>
On Thu, Jun 15, 2023 at 01:12:43PM -0400, Joe Simmons-Talbott wrote:
> In processing the first 7 individual characters of the mode for fopen
> if ,ccs= is used those characters will be processed as well. Stop
> processing individual mode flags once a comma is encountered. This has
> the effect of requiring ,ccs= to be the last mode flag in the mode
> string. Add a testcase to check that the ,ccs= mode flag is not
> processed as individual mode flags.
> ---
> Changes to v1:
> * fclose fp when fopen succeeds. Fixes memory leak found by try-bot
Ping.
Thanks,
Joe
>
> libio/fileops.c | 1 +
> libio/tst-fopenloc.c | 34 +++++++++++++++++++++++++++++++++-
> 2 files changed, 34 insertions(+), 1 deletion(-)
>
> diff --git a/libio/fileops.c b/libio/fileops.c
> index 58c9e985e4..1c1113e339 100644
> --- a/libio/fileops.c
> +++ b/libio/fileops.c
> @@ -247,6 +247,7 @@ _IO_new_file_fopen (FILE *fp, const char *filename, const char *mode,
> switch (*++mode)
> {
> case '\0':
> + case ',':
> break;
> case '+':
> omode = O_RDWR;
> diff --git a/libio/tst-fopenloc.c b/libio/tst-fopenloc.c
> index 089c61bf41..8cd35f01f2 100644
> --- a/libio/tst-fopenloc.c
> +++ b/libio/tst-fopenloc.c
> @@ -17,6 +17,7 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <errno.h>
> +#include <fcntl.h>
> #include <locale.h>
> #include <mcheck.h>
> #include <stdio.h>
> @@ -24,6 +25,7 @@
> #include <string.h>
> #include <wchar.h>
> #include <sys/resource.h>
> +#include <support/check.h>
> #include <support/support.h>
> #include <support/xstdio.h>
>
> @@ -48,13 +50,40 @@ do_bz17916 (void)
> if (fp != NULL)
> {
> printf ("unexpected success\n");
> + free (ccs);
> + fclose (fp);
> return 1;
> }
> +
> free (ccs);
>
> return 0;
> }
>
> +static int
> +do_bz18906 (void)
> +{
> + /* BZ #18906 -- check processing of ,ccs= as flags case. */
> +
> + const char *ccs = "r,ccs=+ISO-8859-1";
> + size_t retval;
> +
> + FILE *fp = fopen (inputfile, ccs);
> + int flags;
> +
> + TEST_VERIFY(fp != NULL);
> +
> + if (fp != NULL)
> + {
> + flags = fcntl(fileno(fp), F_GETFL);
> + retval = (flags & O_RDWR) | (flags & O_WRONLY);
> + TEST_COMPARE(retval, false);
> + fclose (fp);
> + }
> +
> + return EXIT_SUCCESS;
> +}
> +
> static int
> do_test (void)
> {
> @@ -78,7 +107,10 @@ do_test (void)
>
> xfclose (fp);
>
> - return do_bz17916 ();
> + TEST_COMPARE(do_bz17916 (), 0);
> + TEST_COMPARE(do_bz18906 (), 0);
> +
> + return EXIT_SUCCESS;
> }
>
> #include <support/test-driver.c>
> --
> 2.39.2
>
next prev parent reply other threads:[~2023-07-05 18:18 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-15 17:12 Joe Simmons-Talbott
2023-07-05 18:18 ` Joe Simmons-Talbott [this message]
2023-07-05 19:45 ` [PATCH v2] fileops: Don't process , ccs= " DJ Delorie
2023-07-05 20:31 ` Joe Simmons-Talbott
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=20230705181816.GA6392@oak \
--to=josimmon@redhat.com \
--cc=libc-alpha@sourceware.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).