This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[Patch] Fix libstdc++/11389
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: libstdc++ at gcc dot gnu dot org
- Cc: bkoz <bkoz at redhat dot com>
- Date: Tue, 01 Jul 2003 18:00:32 +0200
- Subject: [Patch] Fix libstdc++/11389
Hi,
in a sense this is a regression: the fix for 9178 made difficult
to read long encoding() == 0 files containing only single byte
chars. The below restores the previous behaviour for that case,
while keeping the possibility to read any encoding() > 0 file.
Of course much more work is needed in the area but this little
step doesn't hurt...
Tested x86-linux, ok with everyone?
Paolo.
//////////
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.
diff -urN libstdc++-v3-orig/include/bits/fstream.tcc libstdc++-v3/include/bits/fstream.tcc
--- libstdc++-v3-orig/include/bits/fstream.tcc 2003-06-30 13:17:22.000000000 +0200
+++ libstdc++-v3/include/bits/fstream.tcc 2003-07-01 17:09:39.000000000 +0200
@@ -210,7 +210,8 @@
{
// 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 -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-1.cc 2003-07-01 17:39:46.000000000 +0200
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-2.cc 2003-07-01 17:40:27.000000000 +0200
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-3.cc 2003-07-01 17:41:04.000000000 +0200
@@ -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 -urN libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc
--- libstdc++-v3-orig/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11389-4.cc 2003-07-01 17:41:41.000000000 +0200
@@ -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;
+}