OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR libstdc++/25421 (catching exception from codecvt_byname() segfaults) 

2005-12-15  Paolo Carlini  <pcarlini@suse.de>

	PR libstdc++/25421
	* config/locale/gnu/c_locale.cc (_S_destroy_c_locale): Check
	for null argument.
	* testsuite/22_locale/facet/25421.cc: New.

From-SVN: r108565
This commit is contained in:
Paolo Carlini 2005-12-15 10:11:03 +00:00 committed by Paolo Carlini
parent b1257407e9
commit cd6dba21ac
3 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2005-12-15 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/25421
* config/locale/gnu/c_locale.cc (_S_destroy_c_locale): Check
for null argument.
* testsuite/22_locale/facet/25421.cc: New.
2005-12-13 Carlos O'Donell <carlos@codesourcery.com>
* include/std/std_limits.h (struct numeric_limits):

2
libstdc++-v3/config/locale/gnu/c_locale.cc
View File

@ -100,7 +100,7 @@ namespace std
void
locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
{
if (_S_get_c_locale() != __cloc)
if (__cloc && _S_get_c_locale() != __cloc)
__freelocale(__cloc);
}

67
libstdc++-v3/testsuite/22_locale/facet/25421.cc Normal file
View File

@ -0,0 +1,67 @@
// 2005-12-15 Paolo Carlini <pcarlini@suse.de>
// Copyright (C) 2005 Free Software Foundation
//
// 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, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
// USA.
// 22.1.1.1.2 - class locale::facet [lib.locale.facet]
#include <stdexcept>
#include <locale>
#include <testsuite_hooks.h>
// libstdc++/25421
void test01()
{
bool test __attribute__((unused)) = true;
using namespace std;
try
{
new codecvt_byname<char, char, mbstate_t>("invalid-loc");
new collate_byname<char>("invalid-loc");
new ctype_byname<char>("invalid-loc");
new messages_byname<char>("invalid-loc");
new moneypunct_byname<char, true>("invalid-loc");
new numpunct_byname<char>("invalid-loc");
#ifdef _GLIBCXX_USE_WCHAR_T
new codecvt_byname<wchar_t, char, mbstate_t>("invalid-loc");
new collate_byname<wchar_t>("invalid-loc");
new ctype_byname<wchar_t>("invalid-loc");
new messages_byname<wchar_t>("invalid-loc");
new moneypunct_byname<wchar_t, true>("invalid-loc");
new numpunct_byname<wchar_t>("invalid-loc");
#endif
}
catch(const std::runtime_error&)
{
// named locale not valid
VERIFY( true );
}
catch(...)
{
// some other error
VERIFY( false );
}
}
int main()
{
test01();
return 0;
}