Remove harmful vector::reserve during destruction (nlohmann#1837)

nickaein · Nov 12, 2019 · 0f3ec00 · 0f3ec00
1 parent be61ad1
commit 0f3ec00
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 14 deletions.
diff --git a/include/nlohmann/json.hpp b/include/nlohmann/json.hpp
@@ -1004,13 +1004,10 @@ class basic_json
             // move the top-level items to stack
             if (t == value_t::array)
             {
-                stack.reserve(array->size());
                 std::move(array->begin(), array->end(), std::back_inserter(stack));
             }
             else if (t == value_t::object)
             {
-                stack.reserve(object->size());
-
                 for (auto&& it : *object)
                 {
                     stack.push_back(std::move(it.second));
@@ -1027,17 +1024,13 @@ class basic_json
                 // its children to the stack to be processed later
                 if (current_item.is_array())
                 {
-                    stack.reserve(stack.size() + current_item.m_value.array->size());
-
                     std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
                               std::back_inserter(stack));
 
                     current_item.m_value.array->clear();
                 }
                 else if (current_item.is_object())
                 {
-                    stack.reserve(stack.size() + current_item.m_value.object->size());
-
                     for (auto&& it : *current_item.m_value.object)
                     {
                         stack.push_back(std::move(it.second));

diff --git a/single_include/nlohmann/json.hpp b/single_include/nlohmann/json.hpp
@@ -15547,13 +15547,10 @@ class basic_json
             // move the top-level items to stack
             if (t == value_t::array)
             {
-                stack.reserve(array->size());
                 std::move(array->begin(), array->end(), std::back_inserter(stack));
             }
             else if (t == value_t::object)
             {
-                stack.reserve(object->size());
-
                 for (auto&& it : *object)
                 {
                     stack.push_back(std::move(it.second));
@@ -15570,17 +15567,13 @@ class basic_json
                 // its children to the stack to be processed later
                 if (current_item.is_array())
                 {
-                    stack.reserve(stack.size() + current_item.m_value.array->size());
-
                     std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
                               std::back_inserter(stack));
 
                     current_item.m_value.array->clear();
                 }
                 else if (current_item.is_object())
                 {
-                    stack.reserve(stack.size() + current_item.m_value.object->size());
-
                     for (auto&& it : *current_item.m_value.object)
                     {
                         stack.push_back(std::move(it.second));