[v3] fix libstdc++/9827
Jerry Quinn
jlquinn@optonline.net
Tue Feb 25 14:50:00 GMT 2003
This is fallout from my recent patches to improve IO performance. The fast
put mechanism wasn't checking for failure.
2003-02-25 Jerry Quinn <jlquinn@optonline.net>
* include/bits/streambuf_iterator.h (_M_put): Set _M_failed if sputn
fails.
* testsuite/27_io/ostream_fail.cc: New test.
diff -r -u -N libstdc++.prev/include/bits/streambuf_iterator.h libstdc++-v3/include/bits/streambuf_iterator.h
--- libstdc++.prev/include/bits/streambuf_iterator.h Tue Feb 25 09:45:55 2003
+++ libstdc++-v3/include/bits/streambuf_iterator.h Tue Feb 25 08:51:29 2003
@@ -202,7 +202,8 @@
ostreambuf_iterator&
_M_put(const _CharT* __ws, streamsize __len)
{
- this->_M_sbuf->sputn(__ws, __len);
+ if (this->_M_sbuf->sputn(__ws, __len) != __len)
+ _M_failed = true;
return *this;
}
diff -r -u -N libstdc++.prev/testsuite/27_io/ostream_fail.cc libstdc++-v3/testsuite/27_io/ostream_fail.cc
--- libstdc++.prev/testsuite/27_io/ostream_fail.cc Wed Dec 31 19:00:00 1969
+++ libstdc++-v3/testsuite/27_io/ostream_fail.cc Tue Feb 25 09:06:56 2003
@@ -0,0 +1,52 @@
+// 2003-02-24 Petur Runolfsson <peturr02 at ru dot is>
+
+// Copyright (C) 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library. This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING. If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+#include <ostream>
+#include <streambuf>
+#include <testsuite_hooks.h>
+
+class Buf : public std::streambuf
+{
+};
+
+bool test01()
+{
+ using namespace std;
+ bool test = true;
+
+ Buf buf;
+ ostream stream (&buf);
+
+ stream << 1;
+ VERIFY(!stream.good());
+
+#ifdef DEBUG_ASSERT
+ assert(test);
+#endif
+
+ return test;
+}
+
+
+int main()
+{
+ test01();
+ return 0;
+}
More information about the Libstdc++
mailing list