re PR libstdc++/11389 (Unbuffered wfilebuf fails to read single-byte UTF-8 characters.)

2003-07-01  Paolo Carlini  <pcarlini@unitus.it>

	PR libstdc++/11389
	* include/bits/fstream.tcc (underflow): For encoding() == 0
	don't read more than __buflen chars.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc: New.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc: New.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc: New.
	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc: New.

From-SVN: r68780

6 files changed, 214 insertions, 1 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fcdb9e0..10f5a40 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-01  Paolo Carlini  <pcarlini@unitus.it>
+
+	PR libstdc++/11389
+	* include/bits/fstream.tcc (underflow): For encoding() == 0
+	don't read more than __buflen chars.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc: New.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc: New.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc: New.
+	* testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc: New.
+
 2003-07-01  Jerry Quinn  <jlquinn@optonline.net>
 
 	* 22_locale/num_put/put/char/7.cc: New.
diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index a5510e3..e63ff8b 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -210,7 +210,8 @@ namespace std
 	    {
 	      // Worst-case number of external bytes.
 	      // XXX Not done encoding() == -1.
-	      const streamsize __blen = __buflen * _M_codecvt->max_length();
+	      const int __enc = _M_codecvt->encoding();
+	      const streamsize __blen = __enc > 0 ? __buflen * __enc : __buflen;
 	      char* __buf = static_cast<char*>(__builtin_alloca(__blen));
 	      __elen = _M_file.xsgetn(__buf, __blen);
 
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
new file mode 100644
index 0000000..c4866ef
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
@@ -0,0 +1,49 @@
+// 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.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_01[] = "tmp_11389-1";
+
+void test01()
+{
+  using namespace std;
+  bool test = true;
+
+  filebuf fbout;
+  fbout.open(name_01, ios_base::out);
+  fbout.sputc('a');
+  fbout.close();
+  
+  wfilebuf fbin;
+  locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8"));
+  fbin.pubimbue(loc);
+  fbin.open(name_01, ios_base::in);
+  VERIFY( fbin.sbumpc() == L'a' );
+  VERIFY( fbin.sgetc() == wfilebuf::traits_type::eof() );
+  fbin.close();
+}
+
+int main()
+{
+  test01();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
new file mode 100644
index 0000000..90dfb8f
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
@@ -0,0 +1,51 @@
+// 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.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_02[] = "tmp_11389-2";
+
+void test02()
+{
+  using namespace std;
+  bool test = true;
+
+  filebuf fbout;
+  fbout.open(name_02, ios_base::out);
+  fbout.sputc('a');
+  fbout.sputc('b');
+  fbout.close();
+  
+  wfilebuf fbin;
+  locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8"));
+  fbin.pubimbue(loc);
+  fbin.open(name_02, ios_base::in);
+  VERIFY( fbin.sbumpc() == L'a' );
+  VERIFY( fbin.sbumpc() == L'b' );
+  VERIFY( fbin.sgetc() == wfilebuf::traits_type::eof() );
+  fbin.close();
+}
+
+int main()
+{
+  test02();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
new file mode 100644
index 0000000..c4b4859
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
@@ -0,0 +1,50 @@
+// 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.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_03[] = "tmp_11389-3";
+
+void test03()
+{
+  using namespace std;
+  bool test = true;
+
+  filebuf fbout;
+  fbout.open(name_03, ios_base::out);
+  fbout.sputc('a');
+  fbout.close();
+  
+  wfilebuf fbin;
+  locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8"));
+  fbin.pubimbue(loc);
+  fbin.pubsetbuf(0, 0);
+  fbin.open(name_03, ios_base::in);
+  VERIFY( fbin.sbumpc() == L'a' );
+  VERIFY( fbin.sgetc() == wfilebuf::traits_type::eof() );
+  fbin.close();
+}
+
+int main()
+{
+  test03();
+  return 0;
+}
diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
new file mode 100644
index 0000000..00d1edc
--- /dev/null
+++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
@@ -0,0 +1,52 @@
+// 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.
+
+// 27.8.1.4 Overridden virtual functions
+
+#include <fstream>
+#include <testsuite_hooks.h>
+
+const char name_04[] = "tmp_11389-4";
+
+void test04()
+{
+  using namespace std;
+  bool test = true;
+
+  filebuf fbout;
+  fbout.open(name_04, ios_base::out);
+  fbout.sputc('a');
+  fbout.sputc('b');
+  fbout.close();
+  
+  wfilebuf fbin;
+  locale loc(__gnu_cxx_test::try_named_locale("en_US.UTF-8"));
+  fbin.pubimbue(loc);
+  fbin.pubsetbuf(0, 0);
+  fbin.open(name_04, ios_base::in);
+  VERIFY( fbin.sbumpc() == L'a' );
+  VERIFY( fbin.sbumpc() == L'b' );
+  VERIFY( fbin.sgetc() == wfilebuf::traits_type::eof() );
+  fbin.close();
+}
+
+int main()
+{
+  test04();
+  return 0;
+}