generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

In istream::ignore, check the delimeter as an int_type, not as a char_type, so as to correctly handle EOF. This fixes http://llvm.org/bugs/show_bug.cgi?id=16427

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185298 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Howard Hinnant 2013-07-01 00:37:50 +00:00
parent 099dec1ba0
commit 11b87182b0
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/istream
View File

@ -1144,8 +1144,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
break;
}
++__gc_;
char_type __ch = traits_type::to_char_type(__i);
if (traits_type::eq(__ch, static_cast<char_type>(__dlm)))
if (traits_type::eq_int_type(__i, __dlm))
break;
}
}
@ -1160,8 +1159,7 @@ basic_istream<_CharT, _Traits>::ignore(streamsize __n, int_type __dlm)
break;
}
++__gc_;
char_type __ch = traits_type::to_char_type(__i);
if (traits_type::eq(__ch, static_cast<char_type>(__dlm)))
if (traits_type::eq_int_type(__i, __dlm))
break;
}
}

34
test/input.output/iostream.format/input.streams/istream.unformatted/ignore_0xff.pass.cpp Normal file
View File

@ -0,0 +1,34 @@
//===----------------------------------------------------------------------===//
//
// The LLVM Compiler Infrastructure
//
// This file is dual licensed under the MIT and the University of Illinois Open
// Source Licenses. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
// <istream>
// basic_istream<charT,traits>&
// ignore(streamsize n = 1, int_type delim = traits::eof());
// http://llvm.org/bugs/show_bug.cgi?id=16427
#include <sstream>
#include <cassert>
int main()
{
int bad=-1;
std::ostringstream os;
os << "aaaabbbb" << static_cast<char>(bad)
<< "ccccdddd" << std::endl;
std::string s=os.str();
std::istringstream is(s);
const unsigned int ignoreLen=10;
size_t a=is.tellg();
is.ignore(ignoreLen);
size_t b=is.tellg();
assert((b-a)==ignoreLen);
}