]> git.ipfire.org Git - thirdparty/gcc.git/commit
libstdc++: Fix istream::ignore exit conditions (PR 94749, PR 96161)
authorJonathan Wakely <jwakely@redhat.com>
Mon, 13 Jul 2020 09:26:39 +0000 (10:26 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Mon, 13 Jul 2020 11:09:44 +0000 (12:09 +0100)
commitba8fe4b4832e30277f2e4a73b5d35b2e55074d07
tree04643699ec81c2b8236dbfa4f3590ab2275d191f
parentb20097c65d2e74b1901fba1c55c77f0407e542d2
libstdc++: Fix istream::ignore exit conditions (PR 94749, PR 96161)

My previous fix for PR 94749 did fix the reported case, so that the next
character is not discarded if it happens to equal the delimiter when __n
characters have already been read. But it introduced a new bug, which is
that the delimiter character would *not* be discarded if the number of
characters discarded is numeric_limits<streamsize>::max() or more before
reaching the delimiter.

The new bug happens because I changed the code to check _M_gcount < __n.
But when __n == numeric_limits<streamsize>::max() that is false, and so
we don't discard the delimiter. It's not sufficient to check for the
delimiter when the __large_ignore condition is true, because there's an
edge case where the delimiter is reached when _M_gcount == __n and so
we break out of the loop without setting __large_ignore.

PR 96161 is a similar bug to the original PR 94749 report, where eofbit
is set after discarding __n characters if there happen to be no more
characters in the stream.

This patch fixes both cases (and the regression) by checking different
conditions for the __n == max case and the __n < max case. For the
former case, we know that we must have either reached the delimiter or
EOF, and the value of _M_gcount doesn't matter (except to avoid integer
overflow). For the latter case we need to check _M_gcount first and only
set eofbit or discard the delimiter if it didn't reach __n. For the
latter case overflow can't happen because _M_gcount <= __n < max.

libstdc++-v3/ChangeLog:

PR libstdc++/94749
PR libstdc++/96161
* include/bits/istream.tcc (basic_istream::ignore(streamsize))
[n == max]: Check overflow conditions on _M_gcount. Rely on
the fact that either EOF or the delimiter was reached.
[n < max]: Check _M_gcount < n before checking for EOF or
delimiter.
(basic_istream::ignore(streamsize, char_type): Likewise.
* src/c++98/compatibility.cc (istream::ignore(streamsize))
(wistream::ignore(streamsize)): Likewise.
* src/c++98/istream.cc (istream::ignore(streamsize, char_type))
(wistream::ignore(streamsize, char_type)): Likewise.
* testsuite/27_io/basic_istream/ignore/char/94749.cc: Check that
delimiter is discarded if the number of characters ignored
doesn't fit in streamsize.
* testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc:
Likewise.
* testsuite/27_io/basic_istream/ignore/char/96161.cc: New test.
* testsuite/27_io/basic_istream/ignore/wchar_t/96161.cc: New test.
libstdc++-v3/include/bits/istream.tcc
libstdc++-v3/src/c++98/compatibility.cc
libstdc++-v3/src/c++98/istream.cc
libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc
libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/96161.cc [new file with mode: 0644]
libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc
libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/96161.cc [new file with mode: 0644]