commit 1ed7df111b976508a40e1030dad3be633d65bbf5
author Howard Hinnant <hhinnant@apple.com> Sun Oct 09 15:20:46 2011 +0000
committer Howard Hinnant <hhinnant@apple.com> Sun Oct 09 15:20:46 2011 +0000
tree 7630aa7068734014f02aeb8c8824a1d1b65fd48b
parent fe9179fa4f58eca34a16005caf2d14a86e93a3cb

Fix <rdar://problem/10256836> getline of an empty string mistakenly causes failure

llvm-svn: 141506

libcxx/include/istream

diff --git a/libcxx/include/istream b/libcxx/include/istream
index de8aa10..d2d3776 100644
--- a/libcxx/include/istream
+++ b/libcxx/include/istream
@@ -1586,6 +1586,7 @@
         {
             __str.clear();
             ios_base::iostate __err = ios_base::goodbit;
+            streamsize __extr = 0;
             while (true)
             {
                 typename _Traits::int_type __i = __is.rdbuf()->sbumpc();
@@ -1594,6 +1595,7 @@
                    __err |= ios_base::eofbit;
                    break;
                 }
+                ++__extr;
                 _CharT __ch = _Traits::to_char_type(__i);
                 if (_Traits::eq(__ch, __dlm))
                     break;
@@ -1604,7 +1606,7 @@
                     break;
                 }
             }
-            if (__str.empty())
+            if (__extr == 0)
                __err |= ios_base::failbit;
             __is.setstate(__err);
         }