Merge "Abort when trying to insert duplicated entry" into mainemu-34-2-dev

2 files changed, 13 insertions, 3 deletions

diff --git a/base/HybridEntityManager_unittest.cpp b/base/HybridEntityManager_unittest.cpp
index afc5670..cc67dc7 100644
--- a/base/HybridEntityManager_unittest.cpp
+++ b/base/HybridEntityManager_unittest.cpp
@@ -24,7 +24,7 @@ using TestHCM = HybridEntityManager<kTestMaxIndex, uint64_t, int>;
 TEST(HybridEntityManager, UpdateIndex) {
     TestHCM m;
     // Occupy all linear entries.
-    for (uint32_t i = 0; i < kTestMaxIndex + 1; i++) {
+    for (uint32_t i = 0; i < kTestMaxIndex; i++) {
         m.add(i, 1);
     }
     int indices[4];
diff --git a/base/include/aemu/base/containers/HybridEntityManager.h b/base/include/aemu/base/containers/HybridEntityManager.h
index 68452d9..c5a0c5a 100644
--- a/base/include/aemu/base/containers/HybridEntityManager.h
+++ b/base/include/aemu/base/containers/HybridEntityManager.h
@@ -57,7 +57,12 @@ public:
             mIndexForMap = maxIndex;
         }
         nextIndex = mIndexForMap;
-        mMap[nextIndex] = data;
+        auto emplaced = mMap.emplace(nextIndex, data);
+        if (!emplaced.second) {
+            fprintf(stderr, "%s: fatal: trying to insert duplicated entry 0x%llx\n", __func__,
+                    (unsigned long long)nextIndex);
+            abort();
+        }
         ++mIndexForMap;
         return EM::makeHandle(nextIndex, 1, type);
     }
@@ -71,7 +76,12 @@ public:
             AutoLock lock(mMapLock);
             // Fixed allocations require us to update mIndexForMap to catch up with it.
             mIndexForMap = std::max(index_u64 + 1, mIndexForMap);
-            mMap[index_u64] = data;
+            auto emplaced = mMap.emplace(index_u64, data);
+            if (!emplaced.second) {
+                fprintf(stderr, "%s: fatal: trying to insert duplicated entry 0x%llx\n", __func__,
+                        (unsigned long long)index_u64);
+                abort();
+            }
             return index;
         }
     }