This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.18-886-gdf675f9
- From: siddhesh at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 5 Feb 2014 07:19:06 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.18-886-gdf675f9
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via df675f9933c5d5461cea9224ed43beddef1a7b3a (commit)
via 68159946307adfc95a6e99d1c4af5c3de0c030f9 (commit)
from ae2f53e1eb3cd454d833ce9cb3bc78d791a0cb3e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=df675f9933c5d5461cea9224ed43beddef1a7b3a
commit df675f9933c5d5461cea9224ed43beddef1a7b3a
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Feb 5 12:49:00 2014 +0530
Fix infinite loop in ftell when writing wide char data (BZ #16398)
ftell tries to avoid flushing the buffer when it is in write mode by
converting the wide char data and placing it into the binary buffer.
If the output buffer space is full and there is data to write, the
code reverts to flushing the buffer. This breaks when there is space
in the buffer but it is not enough to convert the next character in
the wide data buffer, due to which __codecvt_do_out returns a
__codecvt_partial status. In this case, ftell keeps running in an
infinite loop.
The fix here is to detect the __codecvt_partial status in addition to
checking if the buffer is full. I have also added a test case that
demonstrates the infinite loop.
diff --git a/libio/Makefile b/libio/Makefile
index 05432f4..747a779 100644
--- a/libio/Makefile
+++ b/libio/Makefile
@@ -60,7 +60,7 @@ tests = tst_swprintf tst_wprintf tst_swscanf tst_wscanf tst_getwc tst_putwc \
tst-wmemstream1 tst-wmemstream2 \
bug-memstream1 bug-wmemstream1 \
tst-setvbuf1 tst-popen1 tst-fgetwc bug-wsetpos tst-fseek \
- tst-fwrite-error
+ tst-fwrite-error tst-ftell-partial-wide
ifeq (yes,$(build-shared))
# Add test-fopenloc only if shared library is enabled since it depends on
# shared localedata objects.
diff --git a/libio/tst-ftell-partial-wide.c b/libio/tst-ftell-partial-wide.c
new file mode 100644
index 0000000..3734e77
--- /dev/null
+++ b/libio/tst-ftell-partial-wide.c
@@ -0,0 +1,107 @@
+/* Verify that ftell does not go into an infinite loop when a conversion fails
+ due to insufficient space in the buffer.
+ Copyright (C) 2014 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <wchar.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <locale.h>
+#include <errno.h>
+#include <unistd.h>
+
+static int do_test (void);
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
+
+/* Arbitrary number large enough so that the target buffer during conversion is
+ not large enough. */
+#define STRING_SIZE (1400)
+#define NSTRINGS (2)
+
+static int
+do_test (void)
+{
+ FILE *fp = NULL;
+ wchar_t *inputs[NSTRINGS] = {NULL};
+ int ret = 1;
+
+ if (setlocale (LC_ALL, "en_US.UTF-8") == NULL)
+ {
+ printf ("Cannot set en_US.UTF-8 locale.\n");
+ goto out;
+ }
+
+
+ /* Generate input from one character, chosen because it has an odd number of
+ bytes in UTF-8, making it easier to reproduce the problem:
+
+ NAME Hiragana letter GO
+ CHAR ã??
+ UTF-8 E38194
+ UCS 3054
+ MARC-8 692434 */
+ wchar_t seed = L'ã??';
+ for (int i = 0; i < NSTRINGS; i++)
+ {
+ inputs[i] = malloc (STRING_SIZE * sizeof (wchar_t));
+ if (inputs[i] == NULL)
+ {
+ printf ("Failed to allocate memory for inputs: %m\n");
+ goto out;
+ }
+ wmemset (inputs[i], seed, STRING_SIZE - 1);
+ inputs[i][STRING_SIZE - 1] = L'\0';
+ }
+
+ char *filename;
+ int fd = create_temp_file ("tst-fseek-wide-partial.out", &filename);
+
+ if (fd == -1)
+ {
+ printf ("create_temp_file: %m\n");
+ goto out;
+ }
+
+ fp = fdopen (fd, "w+");
+ if (fp == NULL)
+ {
+ printf ("fopen: %m\n");
+ close (fd);
+ goto out;
+ }
+
+ for (int i = 0; i < NSTRINGS; i++)
+ {
+ printf ("offset: %ld\n", ftell (fp));
+ if (fputws (inputs[i], fp) == -1)
+ {
+ perror ("fputws");
+ goto out;
+ }
+ }
+ ret = 0;
+
+out:
+ if (fp != NULL)
+ fclose (fp);
+ for (int i = 0; i < NSTRINGS; i++)
+ free (inputs[i]);
+
+ return ret;
+}
diff --git a/libio/wfileops.c b/libio/wfileops.c
index 87d3cdc..877fc1f 100644
--- a/libio/wfileops.c
+++ b/libio/wfileops.c
@@ -715,7 +715,7 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
- fp->_wide_data->_IO_write_base) / clen;
else
{
- enum __codecvt_result status;
+ enum __codecvt_result status = __codecvt_ok;
delta = (fp->_wide_data->_IO_write_ptr
- fp->_wide_data->_IO_write_base);
const wchar_t *write_base = fp->_wide_data->_IO_write_base;
@@ -728,9 +728,12 @@ _IO_wfile_seekoff (fp, offset, dir, mode)
flush buffers for every ftell. */
do
{
- /* Ugh, no point trying to avoid the flush. Just do it
- and go back to how it was with the read mode. */
- if (delta > 0 && new_write_ptr == fp->_IO_buf_end)
+ /* There is not enough space in the buffer to do the entire
+ conversion, so there is no point trying to avoid the
+ buffer flush. Just do it and go back to how it was with
+ the read mode. */
+ if (status == __codecvt_partial
+ || (delta > 0 && new_write_ptr == fp->_IO_buf_end))
{
if (_IO_switch_to_wget_mode (fp))
return WEOF;
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=68159946307adfc95a6e99d1c4af5c3de0c030f9
commit 68159946307adfc95a6e99d1c4af5c3de0c030f9
Author: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed Feb 5 12:22:58 2014 +0530
Update contrib.texi
This may not be a complete list of new contributors added to the list,
so I'd love it if more people look at contributions and suggest
additions.
diff --git a/ChangeLog b/ChangeLog
index 66e4049..9c0a003 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-05 Siddhesh Poyarekar <siddhesh@redhat.com>
+
+ * manual/contrib.texi: Update entry for Ondrej Bilka, Will
+ Newton and Alexandre Oliva. Add entries for Steve Ellcey, Chris
+ Leonard and Allan McRae.
+
2014-02-04 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/ld-le.abilist: New
diff --git a/manual/contrib.texi b/manual/contrib.texi
index 8116367..286aa96 100644
--- a/manual/contrib.texi
+++ b/manual/contrib.texi
@@ -29,7 +29,8 @@ Stephen R. van den Berg for contributing a highly-optimized
@code{strstr} function.
@item
-Ondrej Bilka for contributing optimized string routines for x64.
+Ondrej Bilka for contributing optimized string routines for x64 and various
+fixes.
@item
Eric Blake for adding O(n) implementations of @code{memmem},
@@ -84,6 +85,9 @@ Paul Eggert for the @code{mktime} function and for his direction as
part of @theglibc{} steering committee.
@item
+Steve Ellcey for various fixes.
+
+@item
Tulio Magno Quites Machado Filho for adding a new class of installed
headers for low-level platform-specific functionality and one such for
PowerPC.
@@ -175,6 +179,9 @@ functions @code{malloc}, @code{realloc} and @code{free} and related
code.
@item
+Chris Leonard for various fixes and enhancements to localedata.
+
+@item
Hongjiu Lu for providing the support for a Linux 32-bit runtime
environment under x86-64 (x32), for porting to Linux on IA64, for
improved string functions, a framework for testing IFUNC
@@ -196,6 +203,9 @@ work on the Hurd port, his direction as part of @theglibc{} steering
committee, and for many bug fixes and reviewing of contributions.
@item
+Allan McRae for various fixes.
+
+@item
Jason Merrill for the port to the Sequent Symmetry running Dynix
version 3 (@code{i386-sequent-bsd}).
@@ -232,8 +242,8 @@ coverage of conformtest, and merging the ports/ subdirectory
into the @glibcadj{} main repository.
@item
-Will Newton for contributing an optimized memcpy for ARM NEON and
-VFP chips.
+Will Newton for contributing some optimized string functions and pointer
+encryption support for ARM and various fixes.
@item
Carlos O'Donell for his maintainership of the HPPA architecture and
@@ -242,7 +252,8 @@ maintaining @theglibc{} web pages.
@item
Alexandre Oliva for adding TLS descriptors for LD and GD on x86 and
x86-64, for the am33 port, for completing the MIPS n64/n32/o32 multilib
-port, and for various fixes.
+port, for thread-safety, async-signal safety and async-cancellation
+safety documentation in the manual and for various fixes.
@item
Paul Pluzhnikov for various fixes.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++
libio/Makefile | 2 +-
libio/tst-ftell-partial-wide.c | 107 ++++++++++++++++++++++++++++++++++++++++
libio/wfileops.c | 11 +++--
manual/contrib.texi | 19 ++++++--
5 files changed, 136 insertions(+), 9 deletions(-)
create mode 100644 libio/tst-ftell-partial-wide.c
hooks/post-receive
--
GNU C Library master sources