[hive] Fix a bug I introduced in 6040207

Quuxplusone · Feb 17, 2023 · a3e1232 · a3e1232
1 parent 56aec97
commit a3e1232
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/include/sg14/plf_hive.h b/include/sg14/plf_hive.h
@@ -1912,13 +1912,16 @@ class hive {
             GroupPtr g = groups_with_erasures_;
             assert(g->free_list_head != std::numeric_limits<skipfield_type>::max());
             skipfield_type skipblock_length = g->skipfield(g->free_list_head);
-            if (skipblock_length >= n) {
+            if (skipblock_length > n) {
                 callback_fill_skipblock<false>(n, cb, g);
                 assert_invariants();
                 return;
             } else {
                 callback_fill_skipblock<true>(skipblock_length, cb, g);
                 n -= skipblock_length;
+                if (n == 0) {
+                    return;
+                }
             }
         }
         assert_invariants();

diff --git a/test/hive_test.cpp b/test/hive_test.cpp
@@ -2811,4 +2811,19 @@ TEST(hive, PmrCorrectAllocAwareCtors)
 }
 #endif // __cpp_lib_memory_resource >= 201603
 
+TEST(hive, RangeInsertRegressionTest)
+{
+  auto h = plf::hive<int>(100, 42);
+  h.erase(std::next(h.begin()));
+  h.erase(std::next(h.begin()));
+  EXPECT_EQ(h.size(), 98);
+  h.insert(2, 42); // 42 copies of "42"
+  EXPECT_EQ(h.size(), 100);
+  int sum = 0;
+  for (int i : h) {
+    sum += i;
+  }
+  EXPECT_EQ(sum, 4200);
+}
+
 #endif // __cplusplus >= 201703