diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2020-08-06 19:23:14 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2020-08-06 19:23:14 +0100 |
| commit | 4e39f563c0cd25401f689c2093cb8c13692156ef (patch) | |
| tree | 2f916c09130bbc9794dd9c264ab78c3a2ece7de3 /libstdc++-v3/src | |
| parent | 6a3f3e08723063ea2dadb7ddf503f02972a724e2 (diff) | |
| download | gcc-4e39f563c0cd25401f689c2093cb8c13692156ef.zip gcc-4e39f563c0cd25401f689c2093cb8c13692156ef.tar.gz gcc-4e39f563c0cd25401f689c2093cb8c13692156ef.tar.bz2 | |
libstdc++: Do not set eofbit eagerly in operator>>(istream&, char(&)[N])
Similar to the bugs I fixed recently in istream::ignore, we incorrectly
set eofbit too often in operator>>(istream&, string&) and
operator>>(istream&. char(&)[N]).
We should only set eofbit if we reach EOF but would have kept going
otherwise. If we've already extracted the maximum number of characters
(whether that's because of the buffer size or the istream's width())
then we should not set eofbit.
libstdc++-v3/ChangeLog:
* include/bits/basic_string.tcc
(operator>>(basic_istream&, basic_string&)): Do not set eofbit
if extraction stopped after in.width() characters.
* src/c++98/istream-string.cc (operator>>(istream&, string&)):
Likewise.
* include/bits/istream.tcc (__istream_extract): Do not set
eofbit if extraction stopped after n-1 characters.
* src/c++98/istream.cc (__istream_extract): Likewise.
* testsuite/21_strings/basic_string/inserters_extractors/char/13.cc: New test.
* testsuite/21_strings/basic_string/inserters_extractors/wchar_t/13.cc: New test.
* testsuite/27_io/basic_istream/extractors_character/char/5.cc: New test.
* testsuite/27_io/basic_istream/extractors_character/wchar_t/5.cc: New test.
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/c++98/istream-string.cc | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/istream.cc | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libstdc++-v3/src/c++98/istream-string.cc b/libstdc++-v3/src/c++98/istream-string.cc index c59f2ce..bfd7389 100644 --- a/libstdc++-v3/src/c++98/istream-string.cc +++ b/libstdc++-v3/src/c++98/istream-string.cc @@ -93,7 +93,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - if (__traits_type::eq_int_type(__c, __eof)) + if (__extracted < __n && __traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; __in.width(0); } diff --git a/libstdc++-v3/src/c++98/istream.cc b/libstdc++-v3/src/c++98/istream.cc index 7a48779..79a77b8 100644 --- a/libstdc++-v3/src/c++98/istream.cc +++ b/libstdc++-v3/src/c++98/istream.cc @@ -261,7 +261,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } } - if (__traits_type::eq_int_type(__c, __eof)) + if (__extracted < __num - 1 + && __traits_type::eq_int_type(__c, __eof)) __err |= ios_base::eofbit; // _GLIBCXX_RESOLVE_LIB_DEFECTS |