aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorJoseph Myers <josmyers@redhat.com>2025-01-28 23:20:08 +0000
committerJoseph Myers <josmyers@redhat.com>2025-01-28 23:20:08 +0000
commit3ff3b9997cfef891ba33a14f1dcba0310d96369c (patch)
tree087c3af4b133e92e7e7063c695ae9bf9120b31b6 /stdio-common
parent0dcc0b2f63051863187dc678964eb17761b1a820 (diff)
downloadglibc-3ff3b9997cfef891ba33a14f1dcba0310d96369c.zip
glibc-3ff3b9997cfef891ba33a14f1dcba0310d96369c.tar.gz
glibc-3ff3b9997cfef891ba33a14f1dcba0310d96369c.tar.bz2
Fix fflush handling for mmap files after ungetc (bug 32535)
As discussed in bug 32535, fflush fails on files opened for reading using mmap after ungetc. Fix the logic to handle this case and still compute the file offset correctly. Tested for x86_64.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/Makefile1
-rw-r--r--stdio-common/tst-fflush-mmap.c50
2 files changed, 51 insertions, 0 deletions
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index f80b9ec..2282ea3 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -239,6 +239,7 @@ tests := \
tst-fdopen2 \
tst-ferror \
tst-fflush-all-input \
+ tst-fflush-mmap \
tst-fgets \
tst-fgets2 \
tst-fileno \
diff --git a/stdio-common/tst-fflush-mmap.c b/stdio-common/tst-fflush-mmap.c
new file mode 100644
index 0000000..3bddb90
--- /dev/null
+++ b/stdio-common/tst-fflush-mmap.c
@@ -0,0 +1,50 @@
+/* Test fflush after ungetc on files using mmap (bug 32535).
+ Copyright (C) 2025 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+
+#include <support/check.h>
+#include <support/temp_file.h>
+#include <support/xstdio.h>
+#include <support/xunistd.h>
+
+int
+do_test (void)
+{
+ char *filename = NULL;
+ int fd = create_temp_file ("tst-fflush-mmap", &filename);
+ TEST_VERIFY_EXIT (fd != -1);
+ xclose (fd);
+
+ /* Test fflush after ungetc (bug 32535). */
+ FILE *fp = xfopen (filename, "w");
+ TEST_VERIFY (0 <= fputs ("test", fp));
+ xfclose (fp);
+
+ fp = xfopen (filename, "rm");
+ TEST_COMPARE (fgetc (fp), 't');
+ TEST_COMPARE (ungetc ('u', fp), 'u');
+ TEST_COMPARE (fflush (fp), 0);
+ TEST_COMPARE (fgetc (fp), 't');
+ TEST_COMPARE (fgetc (fp), 'e');
+ xfclose (fp);
+
+ return 0;
+}
+
+#include <support/test-driver.c>