From 976160b962fce53f5ed3fe833af1c9d729327bfb Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 26 Sep 2016 11:17:48 +0100 Subject: [PATCH] Add assertions to extract(const_iterator) functions * include/bits/stl_map.h (map::extract(const_iterator)): Assert that iterator is not past-the-end. * include/bits/stl_multimap.h (multimap::extract(const_iterator)): Likewise. * include/bits/stl_multiset.h (multiset::extract(const_iterator)): Likewise. * include/bits/stl_set.h (set::extract(const_iterator)): Likewise. * include/bits/unordered_map.h (unordered_map::extract(const_iterator)) (unordered_multimap::extract(const_iterator)): Likewise. * include/bits/unordered_set.h (unordered_set::extract(const_iterator)) (unordered_multiset::extract(const_iterator)): Likewise. From-SVN: r240487 --- libstdc++-v3/ChangeLog | 14 ++++++++++++++ libstdc++-v3/include/bits/stl_map.h | 5 ++++- libstdc++-v3/include/bits/stl_multimap.h | 5 ++++- libstdc++-v3/include/bits/stl_multiset.h | 5 ++++- libstdc++-v3/include/bits/stl_set.h | 5 ++++- libstdc++-v3/include/bits/unordered_map.h | 10 ++++++++-- libstdc++-v3/include/bits/unordered_set.h | 10 ++++++++-- 7 files changed, 46 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e3e26d1440c..04ec1f1c6f4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,17 @@ +2016-09-26 Jonathan Wakely + + * include/bits/stl_map.h (map::extract(const_iterator)): Assert that + iterator is not past-the-end. + * include/bits/stl_multimap.h (multimap::extract(const_iterator)): + Likewise. + * include/bits/stl_multiset.h (multiset::extract(const_iterator)): + Likewise. + * include/bits/stl_set.h (set::extract(const_iterator)): Likewise. + * include/bits/unordered_map.h (unordered_map::extract(const_iterator)) + (unordered_multimap::extract(const_iterator)): Likewise. + * include/bits/unordered_set.h (unordered_set::extract(const_iterator)) + (unordered_multiset::extract(const_iterator)): Likewise. + 2016-09-26 Ville Voutilainen PR libstdc++/77717 diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index f9482e29579..9a0454aa583 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -605,7 +605,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_t.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_t.extract(__pos); + } /// Extract a node. node_type diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index 2b56824b449..c794b9bec4e 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -606,7 +606,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_t.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_t.extract(__pos); + } /// Extract a node. node_type diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index d7312dff621..d3219ebf083 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -549,7 +549,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_t.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_t.extract(__pos); + } /// Extract a node. node_type diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index fd96dd4bb58..140db39c9f6 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -565,7 +565,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_t.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_t.extract(__pos); + } /// Extract a node. node_type diff --git a/libstdc++-v3/include/bits/unordered_map.h b/libstdc++-v3/include/bits/unordered_map.h index ab8a7621e0d..6776090e372 100644 --- a/libstdc++-v3/include/bits/unordered_map.h +++ b/libstdc++-v3/include/bits/unordered_map.h @@ -421,7 +421,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_h.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_h.extract(__pos); + } /// Extract a node. node_type @@ -1534,7 +1537,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_h.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_h.extract(__pos); + } /// Extract a node. node_type diff --git a/libstdc++-v3/include/bits/unordered_set.h b/libstdc++-v3/include/bits/unordered_set.h index e5bb2beb80d..99052575d99 100644 --- a/libstdc++-v3/include/bits/unordered_set.h +++ b/libstdc++-v3/include/bits/unordered_set.h @@ -482,7 +482,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_h.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_h.extract(__pos); + } /// Extract a node. node_type @@ -1190,7 +1193,10 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER /// Extract a node. node_type extract(const_iterator __pos) - { return _M_h.extract(__pos); } + { + __glibcxx_assert(__pos != end()); + return _M_h.extract(__pos); + } /// Extract a node. node_type -- 2.30.2