prevent exception cloning search results with partial filter

RetroAchievements · Apr 26, 2024 · ce3483d · ce3483d
1 parent d3d5c91
commit ce3483d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/services/SearchResults.h b/src/services/SearchResults.h
@@ -68,9 +68,15 @@ class MemBlock
         if (!AreAllAddressesMatching())
         {
             if ((m_nMatchingAddresses + 7) / 8 > sizeof(m_vAddresses))
-                std::memcpy(m_pAddresses, other.m_pAddresses, (m_nMatchingAddresses + 7) / 8);
+            {
+                auto* pAddresses = AllocateMatchingAddresses();
+                if (pAddresses != nullptr)
+                    std::memcpy(pAddresses, other.m_pAddresses, (m_nMatchingAddresses + 7) / 8);
+            }
             else
+            {
                 std::memcpy(m_vAddresses, other.m_vAddresses, sizeof(m_vAddresses));
+            }
         }
     }