From: Paolo Carlini Date: Thu, 27 Nov 2003 17:56:05 +0000 (+0000) Subject: re PR libstdc++/11544 (wifstream conversion errors result in wrong rdstate()) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5536b61c1e2a849f29e1a4d9991cc85c2e24c8c7;p=gcc.git re PR libstdc++/11544 (wifstream conversion errors result in wrong rdstate()) 2003-11-27 Paolo Carlini PR libstdc++/11544 PR libstdc++/11603 * include/bits/fstream.tcc (underflow): Throw ios_base:failure upon incomplete or invalid byte sequences in the file. * testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc: New. * testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: New. * testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: New. From-SVN: r74000 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 8d8a4b15a4e..cc6d881a14f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,13 @@ +2003-11-27 Paolo Carlini + + PR libstdc++/11544 + PR libstdc++/11603 + * include/bits/fstream.tcc (underflow): Throw ios_base:failure + upon incomplete or invalid byte sequences in the file. + * testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc: New. + * testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc: New. + * testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc: New. + 2003-11-27 Paolo Carlini * include/std/std_streambuf.h (__copy_streambufs): Remove diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index b15ad7db0a1..db46588d00f 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -201,6 +201,7 @@ namespace std bool __got_eof = false; // Number of internal characters produced. streamsize __ilen = 0; + codecvt_base::result __r = codecvt_base::ok; if (__check_facet(_M_codecvt).always_noconv()) { __ilen = _M_file.xsgetn(reinterpret_cast(this->eback()), @@ -261,9 +262,8 @@ namespace std __got_eof = true; _M_ext_end += __elen; } - + char_type* __iend; - codecvt_base::result __r; __r = _M_codecvt->in(_M_state_cur, _M_ext_next, _M_ext_end, _M_ext_next, this->eback(), this->eback() + __buflen, __iend); @@ -277,7 +277,7 @@ namespace std } else __ilen = __iend - this->eback(); - + // _M_codecvt->in may return error while __ilen > 0: this is // ok, and actually occurs in case of mixed encodings (e.g., // XML files). @@ -302,7 +302,13 @@ namespace std // intervening seek. _M_set_buffer(-1); _M_reading = false; + // However, reaching it while looping on partial means that + // the file has got an incomplete character. + if (__r == codecvt_base::partial) + __throw_ios_failure("incomplete character in file"); } + else if (__r == codecvt_base::error) + __throw_ios_failure("invalid byte sequence in file"); } return __ret; } diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc new file mode 100644 index 00000000000..91d92e4d127 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-1.cc @@ -0,0 +1,185 @@ +// 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 +#include +#include +#include + +template +class checksumcvt : public std::codecvt +{ + typedef std::codecvt Base; + static const size_t width = sizeof(InternT) + 1; + +public: + typedef InternT intern_type; + typedef char extern_type; + + explicit checksumcvt(size_t refs = 0) + : Base(refs) + { } + +protected: + virtual typename std::codecvt::result + do_out(StateT&, const intern_type* from, + const intern_type* from_end, const intern_type*& from_next, + extern_type* to, extern_type* to_end, + extern_type*& to_next) const + { + size_t len = std::min(static_cast(from_end - from), + static_cast(to_end - to) / width); + + while (len--) + { + const char* p = reinterpret_cast(from); + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + *to++ = p[i]; + checksum ^= static_cast(p[i]); + } + + *to++ = checksum; + ++from; + } + + from_next = from; + to_next = to; + return from_next == from_end ? std::codecvt::ok + : std::codecvt::partial; + } + + virtual typename std::codecvt::result + do_unshift(StateT&, extern_type* to, + extern_type*, extern_type*& to_next) const + { + to_next = to; + return std::codecvt::ok; + } + + virtual typename std::codecvt::result + do_in(StateT&, const extern_type* from, + const extern_type* from_end, const extern_type*& from_next, + intern_type* to, intern_type* to_end, + intern_type*& to_next) const + { + size_t len = std::min(static_cast(to_end - to), + static_cast(from_end - from) / width); + + while (len) + { + const char* f = from; + intern_type tmp; + char* p = reinterpret_cast(&tmp); + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + p[i] = *f; + checksum ^= static_cast(*f++); + } + + if (*f++ != checksum) + break; + + from = f; + *to++ = tmp; + len--; + } + + from_next = from; + to_next = to; + return len ? std::codecvt::error : + (from_next == from_end ? std::codecvt::ok + : std::codecvt::partial); + } + + virtual int + do_encoding() const throw() + { return width; } + + virtual int + do_length(StateT&, const extern_type* from, + const extern_type* end, size_t max) const + { + size_t len = std::min(max, static_cast(end - from) / width); + + int ret = 0; + while (len--) + { + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + checksum ^= static_cast(*from++); + } + + if (*from++ != checksum) + break; + + ret++; + } + + return ret; + } + + virtual int + do_max_length() const throw() + { return width; } + + virtual bool + do_always_noconv() const throw() + { return false; } +}; + +// libstdc++/11544 (incomplete character in file) +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + locale loc(locale::classic(), new checksumcvt); + + const char* name = "tmp_11544-1"; + + FILE* f = fopen(name, "w"); + putc('a', f); + fclose(f); + + wifstream in; + in.imbue(loc); + in.open(name); + + VERIFY( in.good() ); + in.get(); + VERIFY( !in.good() ); + VERIFY( in.bad() ); + VERIFY( !in.eof() ); + + in.close(); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc new file mode 100644 index 00000000000..c5e617d7bdf --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11544-2.cc @@ -0,0 +1,185 @@ +// 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 +#include +#include +#include + +template +class checksumcvt : public std::codecvt +{ + typedef std::codecvt Base; + static const size_t width = sizeof(InternT) + 1; + +public: + typedef InternT intern_type; + typedef char extern_type; + + explicit checksumcvt(size_t refs = 0) + : Base(refs) + { } + +protected: + virtual typename std::codecvt::result + do_out(StateT&, const intern_type* from, + const intern_type* from_end, const intern_type*& from_next, + extern_type* to, extern_type* to_end, + extern_type*& to_next) const + { + size_t len = std::min(static_cast(from_end - from), + static_cast(to_end - to) / width); + + while (len--) + { + const char* p = reinterpret_cast(from); + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + *to++ = p[i]; + checksum ^= static_cast(p[i]); + } + + *to++ = checksum; + ++from; + } + + from_next = from; + to_next = to; + return from_next == from_end ? std::codecvt::ok + : std::codecvt::partial; + } + + virtual typename std::codecvt::result + do_unshift(StateT&, extern_type* to, + extern_type*, extern_type*& to_next) const + { + to_next = to; + return std::codecvt::ok; + } + + virtual typename std::codecvt::result + do_in(StateT&, const extern_type* from, + const extern_type* from_end, const extern_type*& from_next, + intern_type* to, intern_type* to_end, + intern_type*& to_next) const + { + size_t len = std::min(static_cast(to_end - to), + static_cast(from_end - from) / width); + + while (len) + { + const char* f = from; + intern_type tmp; + char* p = reinterpret_cast(&tmp); + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + p[i] = *f; + checksum ^= static_cast(*f++); + } + + if (*f++ != checksum) + break; + + from = f; + *to++ = tmp; + len--; + } + + from_next = from; + to_next = to; + return len ? std::codecvt::error : + (from_next == from_end ? std::codecvt::ok + : std::codecvt::partial); + } + + virtual int + do_encoding() const throw() + { return width; } + + virtual int + do_length(StateT&, const extern_type* from, + const extern_type* end, size_t max) const + { + size_t len = std::min(max, static_cast(end - from) / width); + + int ret = 0; + while (len--) + { + unsigned char checksum = 0; + + for (size_t i = 0; i < sizeof(intern_type); ++i) + { + checksum ^= static_cast(*from++); + } + + if (*from++ != checksum) + break; + + ret++; + } + + return ret; + } + + virtual int + do_max_length() const throw() + { return width; } + + virtual bool + do_always_noconv() const throw() + { return false; } +}; + +// libstdc++/11544 (invalid byte sequence in file) +void test02() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + locale loc(locale::classic(), new checksumcvt); + + const char* name = "tmp_11544-2"; + + FILE* f = fopen(name, "w"); + fwrite("aaaab", 1, 5, f); + fclose(f); + + wifstream in; + in.imbue(loc); + in.open(name); + + VERIFY( in.good() ); + in.get(); + VERIFY( !in.good() ); + VERIFY( in.bad() ); + VERIFY( !in.eof() ); + + in.close(); +} + +int main() +{ + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc new file mode 100644 index 00000000000..6b827f15b6e --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/wchar_t/11603.cc @@ -0,0 +1,200 @@ +// 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 +#include +#include + +template +class checksumcvt : public std::codecvt +{ + typedef std::codecvt Base; + static const std::size_t width = sizeof(InternT) + 1; + +public: + typedef InternT intern_type; + typedef char extern_type; + + explicit checksumcvt(std::size_t refs = 0) + : Base(refs) + { } + +protected: + virtual std::codecvt_base::result + do_out(StateT&, const intern_type* from, + const intern_type* from_end, const intern_type*& from_next, + extern_type* to, extern_type* to_end, + extern_type*& to_next) const + { + size_t len = std::min(static_cast(from_end - from), + static_cast(to_end - to) / width); + + while (len--) + { + const char* p = + reinterpret_cast(from); + unsigned char checksum = 0; + + for (std::size_t i = 0; i < sizeof(intern_type); ++i) + { + *to++ = p[i]; + checksum ^= static_cast(p[i]); + } + + *to++ = checksum; + ++from; + } + + from_next = from; + to_next = to; + return from_next == from_end ? std::codecvt_base::ok + : std::codecvt_base::partial; + } + + virtual std::codecvt_base::result + do_unshift(StateT&, extern_type* to, + extern_type*, extern_type*& to_next) const + { + to_next = to; + return std::codecvt_base::ok; + } + + virtual std::codecvt_base::result + do_in(StateT&, const extern_type* from, + const extern_type* from_end, const extern_type*& from_next, + intern_type* to, intern_type* to_end, + intern_type*& to_next) const + { + size_t len = std::min(static_cast(to_end - to), + static_cast(from_end - from) / width); + + while (len) + { + const char* f = from; + intern_type tmp; + char* p = reinterpret_cast(&tmp); + unsigned char checksum = 0; + + for (std::size_t i = 0; i < sizeof(intern_type); ++i) + { + p[i] = *f; + checksum ^= static_cast(*f++); + } + + if (*f++ != checksum) + break; + + from = f; + *to++ = tmp; + len--; + } + + from_next = from; + to_next = to; + return len ? std::codecvt_base::error : + (from_next == from_end ? std::codecvt_base::ok + : std::codecvt_base::partial); + } + + virtual int + do_encoding() const throw() + { return width; } + + virtual int + do_length(const StateT&, const extern_type* from, + const extern_type* end, size_t max) const + { + size_t len = std::min(max, + static_cast(end - from) / width); + + int ret = 0; + while (len--) + { + unsigned char checksum = 0; + + for (std::size_t i = 0; i < sizeof(intern_type); ++i) + { + checksum ^= static_cast(*from++); + } + + if (*from++ != checksum) + break; + + ret++; + } + + return ret; + } + + virtual int + do_max_length() const throw() + { return width; } + + virtual bool + do_always_noconv() const throw() + { return false; } +}; + +class Buf : public std::wfilebuf +{ +public: + std::streamsize pub_showmanyc() + { return showmanyc(); } + std::wfilebuf::int_type pub_underflow() + { return underflow(); } +}; + +// libstdc++/11603 +void test01() +{ + using namespace std; + bool test __attribute__((unused)) = true; + + filebuf fbout; + fbout.open("tmp_11603", ios_base::out); + fbout.sputn("aaaab", 5); + fbout.close(); + + locale loc(locale::classic(), new checksumcvt); + + Buf fb; + fb.pubimbue(loc); + fb.open("tmp_11603", ios_base::in); + assert(fb.pub_showmanyc() == 1); + + try + { + wfilebuf::int_type ret = fb.pub_underflow(); + VERIFY( ret != wfilebuf::traits_type::eof() ); + fb.sbumpc(); + ret = fb.pub_underflow(); + VERIFY( ret == wfilebuf::traits_type::eof() ); + } + catch (...) + { } + + fb.close(); +} + +int main() +{ + test01(); + return 0; +}