diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2008-12-02 10:57:22 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2008-12-02 10:57:22 +0000 |
| commit | 95e5f0ce004baee612104311868171e748dfc43c (patch) | |
| tree | 7bd7887cae9262cf9903166849de818a0cc43383 /libstdc++-v3/src/localename.cc | |
| parent | 0d2a6e08da09208f8c93b36cf8a2a216b1db1955 (diff) | |
| download | gcc-95e5f0ce004baee612104311868171e748dfc43c.tar.gz | |
re PR libstdc++/38365 (Locale, constructed from named and unnamed locales, become named)
2008-12-02 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/38365
* src/localename.cc (locale::locale(const locale&, const locale&,
category)): Fix.
* testsuite/22_locale/locale/cons/38365.cc: New.
From-SVN: r142349
Diffstat (limited to 'libstdc++-v3/src/localename.cc')
| -rw-r--r-- | libstdc++-v3/src/localename.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index 5394d9a99c6..fe6204b9b49 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -1,5 +1,5 @@ // Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -// 2006, 2007 +// 2006, 2007, 2008 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -157,7 +157,14 @@ _GLIBCXX_BEGIN_NAMESPACE(std) locale::locale(const locale& __base, const locale& __add, category __cat) : _M_impl(0) - { _M_coalesce(__base, __add, __cat); } + { + _M_coalesce(__base, __add, __cat); + if (!__base._M_impl->_M_names[0] || !__add._M_impl->_M_names[0]) + { + delete [] _M_impl->_M_names[0]; + _M_impl->_M_names[0] = 0; // Unnamed. + } + } void locale::_M_coalesce(const locale& __base, const locale& __add, |