libstdc++: Fix istream::ignore discarding too many chars (PR 94749)
authorJonathan Wakely <jwakely@redhat.com>
Thu, 11 Jun 2020 17:41:37 +0000 (18:41 +0100)
committerJonathan Wakely <jwakely@redhat.com>
Thu, 11 Jun 2020 17:41:37 +0000 (18:41 +0100)
commitb32eea9c0c25a03e77170675abc4e4bcab6d2b3b
tree9763a78fcc4c3eb8903f96ce5654a1b23752b8b3
parent8f896fe5cd5fd7162d2996d0c28a6e4647597c2b
libstdc++: Fix istream::ignore discarding too many chars (PR 94749)

The current code assumes that if the next character in the stream is
equal to the delimiter then we stopped because we saw that delimiter,
and so discards it.  But in the testcase for the PR we stop because we
reached the maximum number of characters, and it's coincidence that the
next character equals the delimiter. We should not discard the next
character in that case.

The fix is to check that we haven't discarded __n characters already,
instead of checking whether the next character equals __delim. Because
we've already checked for EOF, if we haven't discarded __n yet then we
know we stopped because we saw the delimiter. On the other hand, if the
next character is the delimiter we don't know if that's why we stopped.

PR libstdc++/94749
* include/bits/istream.tcc (basic_istream::ignore(streamsize, CharT)):
Only discard an extra character if we didn't already reach the
maximum number.
* src/c++98/istream.cc (istream::ignore(streamsiz, char))
(wistream::ignore(streamsize, wchar_t)): Likewise.
* testsuite/27_io/basic_istream/ignore/char/94749.cc: New test.
* testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc: New test.
libstdc++-v3/include/bits/istream.tcc
libstdc++-v3/src/c++98/istream.cc
libstdc++-v3/testsuite/27_io/basic_istream/ignore/char/94749.cc [new file with mode: 0644]
libstdc++-v3/testsuite/27_io/basic_istream/ignore/wchar_t/94749.cc [new file with mode: 0644]