Fixed a bug with map iterator++.

We were derefing end() which is invalid.
google · Feb 23, 2018 · 7b70d4a · 7b70d4a
1 parent 00bc3c7
commit 7b70d4a
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/gapil/runtime/cc/map.h b/gapil/runtime/cc/map.h
@@ -216,6 +216,9 @@ const typename Map<K, V>::iterator& Map<K, V>::iterator::operator++() {
     size_t offset = elem - reinterpret_cast<element*>(map->elements);
     for (size_t i = offset; i < map->capacity; ++i) {
         ++elem;
+        if (i == map->capacity - 1) {
+            break;
+        }
         if (elem->used == GAPIL_MAP_ELEMENT_FULL) {
             break;
         }
@@ -268,6 +271,9 @@ typename Map<K, V>::const_iterator& Map<K, V>::const_iterator::operator++() {
     size_t offset = elem - reinterpret_cast<element*>(map->elements);
     for (size_t i = offset; i < map->capacity; ++i) {
         ++elem;
+        if (i == map->capacity - 1) {
+            break;
+        }
         if (elem->used == GAPIL_MAP_ELEMENT_FULL) {
             break;
         }