Browse Source

dense_map: avoid potential UBs

Michele Caini 4 years ago
parent
commit
02f12bde81
1 changed files with 4 additions and 3 deletions
  1. 4 3
      src/entt/container/dense_map.hpp

+ 4 - 3
src/entt/container/dense_map.hpp

@@ -618,8 +618,9 @@ public:
      * @return An iterator following the removed element.
      */
     iterator erase(const_iterator pos) {
+        const auto diff = pos - cbegin();
         erase(pos->first);
-        return begin() + (pos - cbegin());
+        return begin() + diff;
     }
 
     /**
@@ -647,11 +648,11 @@ public:
                 const auto index = *curr;
                 *curr = packed.first()[*curr].next;
                 move_and_pop(index);
-                return true;
+                return 1u;
             }
         }
 
-        return false;
+        return 0u;
     }
 
     /**