* [PATCH v3] fileops: Don't process ,ccs= as individual mode flags (BZ#18906)
@ 2023-07-05 20:29 Joe Simmons-Talbott
2023-07-05 21:20 ` [PATCH v3] fileops: Don't process , ccs= " DJ Delorie
0 siblings, 1 reply; 3+ messages in thread
From: Joe Simmons-Talbott @ 2023-07-05 20:29 UTC (permalink / raw)
To: libc-alpha; +Cc: Joe Simmons-Talbott
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 v2:
* Fix style issues: space before parens.
Changes to v1:
* fclose fp when fopen succeeds. Fixes memory leak found by try-bot
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..5b3c1849ef 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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] fileops: Don't process , ccs= as individual mode flags (BZ#18906)
2023-07-05 20:29 [PATCH v3] fileops: Don't process ,ccs= as individual mode flags (BZ#18906) Joe Simmons-Talbott
@ 2023-07-05 21:20 ` DJ Delorie
2023-07-05 21:22 ` Joe Simmons-Talbott
0 siblings, 1 reply; 3+ messages in thread
From: DJ Delorie @ 2023-07-05 21:20 UTC (permalink / raw)
To: Joe Simmons-Talbott; +Cc: libc-alpha
LGTM.
Reviewed-by: DJ Delorie <dj@redhat.com>
Do you need someone to commit this for you?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] fileops: Don't process , ccs= as individual mode flags (BZ#18906)
2023-07-05 21:20 ` [PATCH v3] fileops: Don't process , ccs= " DJ Delorie
@ 2023-07-05 21:22 ` Joe Simmons-Talbott
0 siblings, 0 replies; 3+ messages in thread
From: Joe Simmons-Talbott @ 2023-07-05 21:22 UTC (permalink / raw)
To: DJ Delorie; +Cc: libc-alpha
On Wed, Jul 05, 2023 at 05:20:29PM -0400, DJ Delorie wrote:
>
> LGTM.
> Reviewed-by: DJ Delorie <dj@redhat.com>
>
> Do you need someone to commit this for you?
>
No, I have write access. Thanks for your review.
Thanks,
Joe
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-05 21:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-07-05 20:29 [PATCH v3] fileops: Don't process ,ccs= as individual mode flags (BZ#18906) Joe Simmons-Talbott
2023-07-05 21:20 ` [PATCH v3] fileops: Don't process , ccs= " DJ Delorie
2023-07-05 21:22 ` Joe Simmons-Talbott
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).