Fix Coverity INVALIDATE_ITERATOR defects.

oneapi-src · Jan 20, 2025 · 8e5f8d0 · 8e5f8d0
1 parent ed09541
commit 8e5f8d0
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/source/common/ur_singleton.hpp b/source/common/ur_singleton.hpp
@@ -76,21 +76,25 @@ template <typename singleton_tn, typename key_tn> class singleton_factory_t {
 
   void retain(key_tn key) {
     std::lock_guard<std::mutex> lk(mut);
-    auto iter = map.find(getKey(key));
-    assert(iter != map.end());
-    iter->second.ref_count++;
+    if (auto iter = map.find(getKey(key)); iter != map.end()) {
+      iter->second.ref_count++;
+    } else {
+      __builtin_unreachable();
+    }
   }
 
   //////////////////////////////////////////////////////////////////////////
   /// once the key is no longer valid, release the singleton
   void release(key_tn key) {
     std::lock_guard<std::mutex> lk(mut);
-    auto iter = map.find(getKey(key));
-    assert(iter != map.end());
-    if (iter->second.ref_count == 0) {
-      map.erase(iter);
+    if (auto iter = map.find(getKey(key)); iter != map.end()) {
+      if (iter->second.ref_count == 0) {
+        map.erase(iter);
+      } else {
+        iter->second.ref_count--;
+      }
     } else {
-      iter->second.ref_count--;
+      __builtin_unreachable();
     }
   }