PR libstdc++/12352 (cont)

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

	PR libstdc++/12352 (cont)
	* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
	Don't leak __cloc; don't leak if any of the _M_init_facet(...)
	calls fail.
	(locale::_Impl::_Impl(const _Impl&, size_t)): Tweak.
	(locale::_Impl::~_Impl): Don't do anything if !_M_facets,
	!_M_caches, !_M_names.

From-SVN: r71936

libstdc++-v3/ChangeLog

+2003-09-30  Paolo Carlini  <pcarlini@unitus.it>
+
+	PR libstdc++/12352 (cont)
+	* src/localename.cc (locale::_Impl::_Impl(const char*, size_t)):
+	Don't leak __cloc; don't leak if any of the _M_init_facet(...)
+	calls fail.
+	(locale::_Impl::_Impl(const _Impl&, size_t)): Tweak.
+	(locale::_Impl::~_Impl): Don't do anything if !_M_facets,
+	!_M_caches, !_M_names.
+
 2003-09-29  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
 
 	* configure.host: Handle Solaris 2.5 micro releases explicitly.

libstdc++-v3/src/localename.cc

@@ -91,16 +91,19 @@ namespace std
   locale::_Impl::
   ~_Impl() throw()
   {
+    if (_M_facets)
       for (size_t __i = 0; __i < _M_facets_size; ++__i)
 	if (_M_facets[__i])
 	  _M_facets[__i]->_M_remove_reference();
     delete [] _M_facets;
 
+    if (_M_caches)
       for (size_t __i = 0; __i < _M_facets_size; ++__i)
 	if (_M_caches[__i])
 	  _M_caches[__i]->_M_remove_reference(); 
     delete [] _M_caches;
 
+    if (_M_names)
       for (size_t __i = 0; __i < _S_categories_size; ++__i)
 	delete [] _M_names[__i];  
     delete [] _M_names;
@@ -116,31 +119,24 @@ namespace std
     try
       {
 	_M_facets = new const facet*[_M_facets_size];
-	_M_caches = new const facet*[_M_facets_size];
-	_M_names = new char*[_S_categories_size];
-      }
-    catch(...)
-      {
-	delete [] _M_facets;
-	delete [] _M_caches;		
-	__throw_exception_again;
-      }
-
 	for (size_t __i = 0; __i < _M_facets_size; ++__i)
 	  {
 	    _M_facets[__i] = __imp._M_facets[__i];
-	_M_caches[__i] = __imp._M_caches[__i];
 	    if (_M_facets[__i])
 	      _M_facets[__i]->_M_add_reference();
+	  }
+	_M_caches = new const facet*[_M_facets_size];
+	for (size_t __i = 0; __i < _M_facets_size; ++__i)
+	  {
+	    _M_caches[__i] = __imp._M_caches[__i];
 	    if (_M_caches[__i])
 	      _M_caches[__i]->_M_add_reference(); 	
 	  }
-
-    // Name all the categories.
+	_M_names = new char*[_S_categories_size];
 	for (size_t __i = 0; __i < _S_categories_size; ++__i)
 	  _M_names[__i] = 0;
-    try
-      {
+
+	// Name all the categories.
 	for (size_t __i = 0; __i < _S_categories_size; ++__i)
 	  {
 	    char* __new = new char[std::strlen(__imp._M_names[__i]) + 1];
@@ -170,24 +166,16 @@ namespace std
     try
       {
 	_M_facets = new const facet*[_M_facets_size];
+	for (size_t __i = 0; __i < _M_facets_size; ++__i)
+	  _M_facets[__i] = 0;
 	_M_caches = new const facet*[_M_facets_size];
-	_M_names = new char*[_S_categories_size];
-      }
-    catch(...)
-      {
-	delete [] _M_facets;
-	delete [] _M_caches;
-	__throw_exception_again;
-      }      
-
 	for (size_t __i = 0; __i < _M_facets_size; ++__i)
-      _M_facets[__i] = _M_caches[__i] = 0;
-
-    // Name all the categories.
+	  _M_caches[__i] = 0;
+	_M_names = new char*[_S_categories_size];
 	for (size_t __i = 0; __i < _S_categories_size; ++__i)
 	  _M_names[__i] = 0;
-    try
-      {
+
+	// Name all the categories.
 	const size_t __len = std::strlen(__s);
 	if (!std::strchr(__s, ';'))
 	  {
@@ -212,12 +200,6 @@ namespace std
 		_M_names[__i] = __new;
 	      }
 	  }
-      }
-    catch(...)
-      {
-	this->~_Impl();
-	__throw_exception_again;
-      }
  
 	// Construct all standard facets and add them to _M_facets.
 	_M_init_facet(new std::ctype<char>(__cloc, 0, false));
@@ -251,9 +233,15 @@ namespace std
 	_M_init_facet(new time_put<wchar_t>);
 	_M_init_facet(new std::messages<wchar_t>(__cloc, __s));
 #endif	  
-
 	locale::facet::_S_destroy_c_locale(__cloc);
       }
+    catch(...)
+      {
+	locale::facet::_S_destroy_c_locale(__cloc);
+	this->~_Impl();
+	__throw_exception_again;
+      }	
+  }
 
   // Construct "C" _Impl.
   locale::_Impl::