From 86fd2b512a1e282072ca7e72905ebded5b5cd30d Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 9 Feb 2004 09:02:52 +0000 Subject: [PATCH] re PR libstdc++/14072 (basic_ios::imbue leaves dangling pointers) 2004-02-09 Paolo Carlini PR libstdc++/14072 * include/bits/basic_ios.tcc (basic_ios<>::_M_cache_locale): Don't leave dangling pointers. * testsuite/27_io/basic_ios/imbue/14072.cc: New. * testsuite/22_locale/numpunct/members/pod/2.cc: Tweak, the num_put facet is needed in the final test. From-SVN: r77526 --- libstdc++-v3/ChangeLog | 9 + libstdc++-v3/include/bits/basic_ios.tcc | 8 + .../22_locale/numpunct/members/pod/2.cc | 2 +- .../testsuite/27_io/basic_ios/imbue/14072.cc | 220 ++++++++++++++++++ 4 files changed, 238 insertions(+), 1 deletion(-) create mode 100644 libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 885041db3e4c..35cfcc353ea6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2004-02-09 Paolo Carlini + + PR libstdc++/14072 + * include/bits/basic_ios.tcc (basic_ios<>::_M_cache_locale): + Don't leave dangling pointers. + * testsuite/27_io/basic_ios/imbue/14072.cc: New. + * testsuite/22_locale/numpunct/members/pod/2.cc: Tweak, the num_put + facet is needed in the final test. + 2004-02-09 Bernardo Innocenti * crossconfig.m4: Don't enable _GLIBCXX_USE_LFS on *-uclinux*. diff --git a/libstdc++-v3/include/bits/basic_ios.tcc b/libstdc++-v3/include/bits/basic_ios.tcc index cc730672af91..fcb4b02493f6 100644 --- a/libstdc++-v3/include/bits/basic_ios.tcc +++ b/libstdc++-v3/include/bits/basic_ios.tcc @@ -171,10 +171,18 @@ namespace std { if (__builtin_expect(has_facet<__ctype_type>(__loc), true)) _M_ctype = &use_facet<__ctype_type>(__loc); + else + _M_ctype = 0; + if (__builtin_expect(has_facet<__num_put_type>(__loc), true)) _M_num_put = &use_facet<__num_put_type>(__loc); + else + _M_num_put = 0; + if (__builtin_expect(has_facet<__num_get_type>(__loc), true)) _M_num_get = &use_facet<__num_get_type>(__loc); + else + _M_num_get = 0; } // Inhibit implicit instantiations for required instantiations, diff --git a/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc b/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc index bb970369ee34..be020ca46687 100644 --- a/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc +++ b/libstdc++-v3/testsuite/22_locale/numpunct/members/pod/2.cc @@ -74,7 +74,7 @@ void test01() VERIFY( test ); // 3: fail, no numpunct - const locale loc3(loc, new ctype); + const locale loc3(loc2, new ctype); os.clear(); os.imbue(loc3); try diff --git a/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc new file mode 100644 index 000000000000..77fafc7a233a --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/basic_ios/imbue/14072.cc @@ -0,0 +1,220 @@ +// 2004-02-09 Petur Runolfsson + +// Copyright (C) 2004 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. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// 27.4.4.2 basic_ios member functions + +#include +#include + +#include +#include + +namespace std +{ + template<> + class ctype<__gnu_test::character> + : public locale::facet, public ctype_base + { + public: + typedef __gnu_test::character char_type; + explicit ctype(size_t refs = 0) + : locale::facet(refs) { } + + bool + is(mask m, char_type c) const + { return this->do_is(m, c); } + + const char_type* + is(const char_type* low, const char_type* high, mask* vec) const + { return this->do_is(low, high, vec); } + + const char_type* + scan_is(mask m, const char_type* low, const char_type* high) const + { return this->do_scan_is(m, low, high); } + + const char_type* + scan_not(mask m, const char_type* low, const char_type* high) const + { return this->do_scan_not(m, low, high); } + + char_type + toupper(char_type c) const + { return this->do_toupper(c); } + + const char_type* + toupper(char_type* low, const char_type* high) const + { return this->do_toupper(low, high); } + + char_type + tolower(char_type c) const + { return this->do_tolower(c); } + + const char_type* + tolower(char_type* low, const char_type* high) const + { return this->do_tolower(low, high); } + + char_type + widen(char c) const + { return this->do_widen(c); } + + const char* + widen(const char* low, const char* high, char_type* to) const + { return this->do_widen(low, high, to); } + + char + narrow(char_type c, char dfault) const + { return this->do_narrow(c, dfault); } + + const char_type* + narrow(const char_type* low, const char_type* high, + char dfault, char* to) const + { return this->do_narrow(low, high, dfault, to); } + + static locale::id id; + + protected: + ~ctype() + { } + + virtual bool + do_is(mask m, char_type c) const + { return false; } + + virtual const char_type* + do_is(const char_type* low, const char_type* high, mask* vec) const + { + fill_n(vec, high - low, mask()); + return high; + } + + virtual const char_type* + do_scan_is(mask m, const char_type* low, const char_type* high) const + { return high; } + + virtual const char_type* + do_scan_not(mask m, const char_type* low, const char_type* high) const + { return low; } + + virtual char_type + do_toupper(char_type c) const + { return c; } + + virtual const char_type* + do_toupper(char_type* low, const char_type* high) const + { return high; } + + virtual char_type + do_tolower(char_type c) const + { return c; } + + virtual const char_type* + do_tolower(char_type* low, const char_type* high) const + { return high; } + + virtual char_type + do_widen(char c) const + { return __gnu_test::character::from_char(c); } + + virtual const char* + do_widen(const char* low, const char* high, char_type* dest) const + { + transform(low, high, dest, &__gnu_test::character::from_char); + return high; + } + + virtual char + do_narrow(char_type, char dfault) const + { return dfault; } + + virtual const char_type* + do_narrow(const char_type* low, const char_type* high, + char dfault, char* dest) const + { + fill_n(dest, high - low, dfault); + return high; + } + }; + + locale::id ctype<__gnu_test::character>::id; +} // namespace std + +// libstdc++/14072 +void test01() +{ + bool test __attribute__((unused)) = true; + using namespace std; + + locale loc; + loc = locale(loc, new ctype<__gnu_test::character>()); + loc = locale(loc, new num_get<__gnu_test::character>()); + loc = locale(loc, new num_put<__gnu_test::character>()); + + locale::global(loc); + basic_stringstream<__gnu_test::character> s; + s << "10\n"; + s.seekg(0, ios_base::beg); + s.imbue(locale::classic()); + locale::global(locale::classic()); + loc = locale::classic(); + + try + { + s.widen('\0'); + } + catch (bad_cast&) + { + } + + s.clear(); + + try + { + int i = 0; + s << i; + } + catch (bad_cast&) + { + } + + s.clear(); + + try + { + int i = 0; + s >> i; + } + catch (bad_cast&) + { + } +} + +int main() +{ + test01(); + return 0; +}