PR libstdc++/81891 fix double-free in hashtable constructor

Backport from mainline
2017-08-18  Jonathan Wakely  <jwakely@redhat.com>

	PR libstdc++/81891
	* include/bits/hashtable.h (_Hashtable(_InputIterator, _InputIterator,
	size_type, const _H1&, const _H2&, const _Hash&, const _Equal&,
	const _ExtractKey&, const allocator_type&)): Let destructor do clean
	up if an exception is thrown.
	* testsuite/23_containers/unordered_map/cons/81891.cc: New.

From-SVN: r251671

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index ec50f013ad6f8277442120be3f2c2cf7358e26ca..d876052b2a8693671b125421903a63ee4b46dea0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,15 @@
 2017-09-04  Jonathan Wakely  <jwakely@redhat.com>
 
+       Backport from mainline
+       2017-08-18  Jonathan Wakely  <jwakely@redhat.com>
+
+       PR libstdc++/81891
+       * include/bits/hashtable.h (_Hashtable(_InputIterator, _InputIterator,
+       size_type, const _H1&, const _H2&, const _Hash&, const _Equal&,
+       const _ExtractKey&, const allocator_type&)): Let destructor do clean
+       up if an exception is thrown.
+       * testsuite/23_containers/unordered_map/cons/81891.cc: New.
+
        Backport from mainline
        2017-07-31  Marek Polacek  <polacek@redhat.com>
 

diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index f5f298ea33c2b8f7abbe43a7600662597dfec77c..332db5cdf49f17ca21ebcf419243e891691857d4 100644 (file)
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -834,17 +834,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
            _M_bucket_count = __bkt_count;
          }
 
-       __try
-         {
-           for (; __f != __l; ++__f)
-             this->insert(*__f);
-         }
-       __catch(...)
-         {
-           clear();
-           _M_deallocate_buckets();
-           __throw_exception_again;
-         }
+       for (; __f != __l; ++__f)
+         this->insert(*__f);
       }
 
   template<typename _Key, typename _Value,

diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/cons/81891.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/81891.cc
new file mode 100644 (file)
index 0000000..5c068aa
--- /dev/null
+++ b/libstdc++-v3/testsuite/23_containers/unordered_map/cons/81891.cc
@@ -0,0 +1,68 @@
+// Copyright (C) 2017 Free Software Foundation, Inc.
+//
+// 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 3, 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 COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-options "-std=gnu++11" }
+
+#include <unordered_map>
+#include <testsuite_hooks.h>
+#include <testsuite_allocator.h>
+
+struct fails_on_copy {
+  fails_on_copy() = default;
+  fails_on_copy(const fails_on_copy&) { throw 0; };
+};
+
+using value_type = std::pair<int, fails_on_copy>;
+
+void
+test01()
+{
+  value_type p;
+  try
+  {
+    std::unordered_map<int, fails_on_copy> umap(&p, &p + 1);
+  }
+  catch(...)
+  { }
+}
+
+void
+test02()
+{
+  using Alloc = __gnu_test::tracker_allocator<value_type>;
+  using std::hash;
+  using std::equal_to;
+
+  value_type p;
+  try
+  {
+    std::unordered_map<int, fails_on_copy, hash<int>, equal_to<int>, Alloc>
+       umap(&p, &p + 1);
+  }
+  catch(...)
+  { }
+
+  using counter = __gnu_test::tracker_allocator_counter;
+  VERIFY(counter::get_allocation_count() == counter::get_deallocation_count());
+}
+
+int
+main()
+{
+  test01();
+  test02();
+}