mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-02 16:23:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

re PR libstdc++/12438 (Memory leak in locale::combine())

Browse Source 
2003-09-30  Paolo Carlini  <pcarlini@unitus.it>

	PR libstdc++/12438
	* include/bits/locale_facets.tcc (locale::combine): Don't
	leak memory if _M_replace_facet throws.
	* testsuite/22_locale/locale/cons/12438.cc: New, from the PR.

	* include/bits/locale_classes.h (locale::locale(const locale&,
	_Facet*)): Tweak, use consistently _M_remove_reference.

From-SVN: r71943
This commit is contained in:
Paolo Carlini 2003-09-30 15:44:59 +02:00 committed by Paolo Carlini
parent daafa301e4
commit 155f6fbb62
4 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2003-09-30 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/12438
* include/bits/locale_facets.tcc (locale::combine): Don't
leak memory if _M_replace_facet throws.
* testsuite/22_locale/locale/cons/12438.cc: New, from the PR.
* include/bits/locale_classes.h (locale::locale(const locale&,
_Facet*)): Tweak, use consistently _M_remove_reference.
2003-09-30 Paolo Carlini <pcarlini@unitus.it>
PR libstdc++/12352 (cont)

2
libstdc++-v3/include/bits/locale_classes.h
View File

@ -393,7 +393,7 @@ namespace std
}
catch(...)
{
delete _M_impl;
_M_impl->_M_remove_reference();
for (size_t __j = 0; __j < __i; ++__j)
delete [] _M_tmp_names[__j];
__throw_exception_again;

10
libstdc++-v3/include/bits/locale_facets.tcc
View File

@ -51,7 +51,15 @@ namespace std
locale::combine(const locale& __other) const
{
_Impl* __tmp = new _Impl(*_M_impl, 1);
__tmp->_M_replace_facet(__other._M_impl, &_Facet::id);
try
{
__tmp->_M_replace_facet(__other._M_impl, &_Facet::id);
}
catch(...)
{
__tmp->_M_remove_reference();
__throw_exception_again;
}
return locale(__tmp);
}

70
libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc Normal file
View File

@ -0,0 +1,70 @@
// Copyright (C) 2003 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, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// 22.1.1.2 locale constructors and destructors [lib.locale.cons]
#include <locale>
#include <stdexcept>
#include <cstdlib>
#include <testsuite_hooks.h>
class MyFacet : public std::locale::facet
{
public:
static std::locale::id id;
};
std::locale::id MyFacet::id;
// libstdc++/12438
void test01(int iters)
{
using namespace std;
bool test __attribute__((unused)) = true;
for (int i = 0; i < iters; ++i)
{
try
{
locale loc1 = locale::classic();
locale loc2("");
VERIFY( !has_facet<MyFacet>(loc2) );
loc1.combine<MyFacet>(loc2);
VERIFY( false );
}
catch (std::runtime_error&)
{
}
}
}
int main(int argc, char* argv[])
{
// We leaked ~400-500 bytes/iter.
__gnu_test::set_memory_limits(2.5);
int iters = 10000;
if (argc > 1)
iters = atoi(argv[1]);
if (iters < 1)
iters = 1;
test01(iters);
return 0;
}