This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[v3] Fix libstdc++/12438
- From: Paolo Carlini <pcarlini at unitus dot it>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 30 Sep 2003 15:47:02 +0200
- Subject: [v3] Fix libstdc++/12438
Hi,
tested x86-linux, committed.
Paolo.
///////////
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.
diff -urN libstdc++-v3-orig/include/bits/locale_classes.h libstdc++-v3/include/bits/locale_classes.h
--- libstdc++-v3-orig/include/bits/locale_classes.h 2003-09-26 02:22:01.000000000 +0200
+++ libstdc++-v3/include/bits/locale_classes.h 2003-09-30 10:28:23.000000000 +0200
@@ -393,7 +393,7 @@
}
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;
diff -urN libstdc++-v3-orig/include/bits/locale_facets.tcc libstdc++-v3/include/bits/locale_facets.tcc
--- libstdc++-v3-orig/include/bits/locale_facets.tcc 2003-09-23 22:02:02.000000000 +0200
+++ libstdc++-v3/include/bits/locale_facets.tcc 2003-09-30 13:38:47.000000000 +0200
@@ -51,7 +51,15 @@
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);
}
diff -urN libstdc++-v3-orig/testsuite/22_locale/locale/cons/12438.cc libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc
--- libstdc++-v3-orig/testsuite/22_locale/locale/cons/12438.cc 1970-01-01 01:00:00.000000000 +0100
+++ libstdc++-v3/testsuite/22_locale/locale/cons/12438.cc 2003-09-30 13:39:22.000000000 +0200
@@ -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;
+}