From 65f58f3fe806f275867cf8d50e6a39349d8da8a0 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Wed, 6 Mar 2013 19:27:56 +0000 Subject: [PATCH] Have basic_istream::read call sgetn intead of sbumpc individual characters. This addresses http://llvm.org/bugs/show_bug.cgi?id=15427. llvm-svn: 176573 --- libcxx/include/istream | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/libcxx/include/istream b/libcxx/include/istream index 3979e14..e484571 100644 --- a/libcxx/include/istream +++ b/libcxx/include/istream @@ -1216,16 +1216,9 @@ basic_istream<_CharT, _Traits>::read(char_type* __s, streamsize __n) sentry __sen(*this, true); if (__sen) { - for (; __gc_ < __n; ++__gc_) - { - typename traits_type::int_type __i = this->rdbuf()->sbumpc(); - if (traits_type::eq_int_type(__i, traits_type::eof())) - { - this->setstate(ios_base::failbit | ios_base::eofbit); - break; - } - *__s++ = traits_type::to_char_type(__i); - } + __gc_ = this->rdbuf()->sgetn(__s, __n); + if (__gc_ != __n) + this->setstate(ios_base::failbit | ios_base::eofbit); } else this->setstate(ios_base::failbit); -- 2.7.4