Synchronize changes from 1.6 master branch [ci skip]

0981fae Addendum to 5429339 (Server list crash fixes)

Author: github-actions[bot]

Client/core/ServerBrowser/CServerBrowser.cpp

@@ -1455,6 +1455,8 @@ bool CServerBrowser::OnClick(CGUIElement* pElement)
         for (i = i_b; i != i_e; i++)
         {
             CServerListItem* pServer = *i;
+            if (!pServer || !CServerListItem::StaticIsValid(pServer))
+                continue;
 
             for (std::size_t j = 0; j < pServer->vecPlayers.size(); ++j)
             {
@@ -1750,6 +1752,8 @@ bool CServerBrowser::OnAddressChanged(CGUIElement* pElement)
     for (CServerListIterator i = i_b; i != i_e; i++)
     {
         CServerListItem* pServer = *i;
+        if (!pServer || !CServerListItem::StaticIsValid(pServer))
+            continue;
         if (pServer->strHost == strHost && pServer->usGamePort == usPort)
         {
             for (std::size_t iconIndex = 0; iconIndex < std::size(m_pAddressFavoriteIcon); ++iconIndex)
@@ -2098,6 +2102,8 @@ bool CServerBrowser::SaveServerList(CXMLNode* pNode, const std::string& strTagNa
         if (iLimit && iProcessed == iLimit)
             break;
         CServerListItem* pServer = *i;
+        if (!pServer || !CServerListItem::StaticIsValid(pServer))
+            continue;
 
         // Add the item to the node
         CXMLNode* pSubNode = pNode->CreateSubNode(strTagName.c_str());
@@ -2444,7 +2450,7 @@ bool CServerBrowser::ProcessServerListRefreshBatch(ServerBrowserType type, size_
     size_t processed = 0;
     while (state.iterator != state.endIterator && processed < uiMaxSteps)
     {
-        CServerListItem* pServer = (state.iterator != state.endIterator) ? *state.iterator : nullptr;
+        CServerListItem* pServer = *state.iterator;
 
         // The list can briefly hand us null if an item was erased between batches
         if (!pServer)
@@ -2462,16 +2468,17 @@ bool CServerBrowser::ProcessServerListRefreshBatch(ServerBrowserType type, size_
             continue;
         }
 
+        // Additional safety check before accessing members
         if (state.bNeedsListClear)
             pServer->iRowIndex = -1;
 
         if (type == ServerBrowserTypes::FAVOURITES || type == ServerBrowserTypes::RECENTLY_PLAYED)
         {
-            if (pServer->Address.s_addr != 0 && pServer->usGamePort != 0)
+            if (pServer && pServer->Address.s_addr != 0 && pServer->usGamePort != 0)
                 GetServerCache()->GetServerCachedInfo(pServer);
         }
 
-        if (pServer->revisionInList[type] != pServer->uiRevision || state.bClearServerList)
+        if (pServer && (pServer->revisionInList[type] != pServer->uiRevision || state.bClearServerList))
         {
             if (!state.bDidUpdateRowIndices)
             {
@@ -2750,6 +2757,8 @@ CServerListItem* CServerBrowser::FindServer(const std::string& strHost, unsigned
     for (CServerListIterator i = i_b; i != i_e; i++)
     {
         CServerListItem* pServer = *i;
+        if (!pServer || !CServerListItem::StaticIsValid(pServer))
+            continue;
         if (pServer->strHost == strHost && pServer->usGamePort == usPort)
             return pServer;
     }
@@ -2770,6 +2779,8 @@ unsigned short CServerBrowser::FindServerHttpPort(const std::string& strHost, un
     for (CServerListIterator i = i_b; i != i_e; i++)
     {
         CServerListItem* pServer = *i;
+        if (!pServer || !CServerListItem::StaticIsValid(pServer))
+            continue;
         if (pServer->strHost == strHost && pServer->usGamePort == usPort)
             return pServer->m_usHttpPort;
     }
@@ -2791,6 +2802,8 @@ void CServerBrowser::UpdateRowIndexMembers(ServerBrowserType Type)
     for (int iRowIndex = 0; iRowIndex < iRowCount; iRowIndex++)
     {
         CServerListItem* pServer = (CServerListItem*)pServerList->GetItemData(iRowIndex, DATA_PSERVER);
+        if (!pServer || !CServerListItem::StaticIsValid(pServer))
+            continue;
         pServer->iRowIndex = iRowIndex;
     }
 }