Synchronize changes from 1.6 master branch [ci skip]

6680737 Linux/arm crash fix (segmentation fault): added a check to verify itemList validity (empty) (#3301)
multitheftauto · Jan 30, 2024 · e858f20 · e858f20
2 parents 86da721 + 6680737
commit e858f20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Shared/sdk/CFastList.h b/Shared/sdk/CFastList.h
@@ -307,6 +307,8 @@ class CFastList
 template <class T, class U>
 bool ListContains(const CFastList<T*>& itemList, const U& item)
 {
+    if (itemList.empty())
+        return false;
     return itemList.contains(item);
 }
 

diff --git a/Shared/sdk/SharedUtil.Misc.h b/Shared/sdk/SharedUtil.Misc.h
@@ -344,13 +344,14 @@ namespace SharedUtil
     template <class TL, class T>
     bool ListContains(const TL& itemList, const T& item)
     {
+        if (itemList.empty())
+            return false;
         typename TL ::const_iterator it = itemList.begin();
         for (; it != itemList.end(); ++it)
             if (item == *it)
                 return true;
         return false;
     }
-
     // Add item if it does not aleady exist in itemList
     template <class TL, class T>
     void ListAddUnique(TL& itemList, const T& item)