From cd6dba21ac4803bde1b149365d543dd81500ded5 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Thu, 15 Dec 2005 10:11:03 +0000
Subject: [PATCH] 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
---
 libstdc++-v3/ChangeLog                        |  7 ++
 libstdc++-v3/config/locale/gnu/c_locale.cc    |  2 +-
 .../testsuite/22_locale/facet/25421.cc        | 67 +++++++++++++++++++
 3 files changed, 75 insertions(+), 1 deletion(-)
 create mode 100644 libstdc++-v3/testsuite/22_locale/facet/25421.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 92111797df6..5197f12c3ef 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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):
diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc
index 493ad4b2ca3..7a45a6e9fda 100644
--- a/libstdc++-v3/config/locale/gnu/c_locale.cc
+++ b/libstdc++-v3/config/locale/gnu/c_locale.cc
@@ -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); 
   }
 
diff --git a/libstdc++-v3/testsuite/22_locale/facet/25421.cc b/libstdc++-v3/testsuite/22_locale/facet/25421.cc
new file mode 100644
index 00000000000..93b873fef4b
--- /dev/null
+++ b/libstdc++-v3/testsuite/22_locale/facet/25421.cc
@@ -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;
+}
-- 
2.30.2