abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Further reverted RangeManager sorting to stable_sort, since possibly with different STL implementations, the order of entities might change and cause OOS.

Browse Source 
Overflowing elements in SpatialQueryArray are now reported with
debug_warn, but can be ignored and the program will continue working,
but further entities will be truncated.

This was SVN commit r13860.
This commit is contained in:
Jorma Rebane 2013-09-15 21:11:20 +00:00
parent bb799bdd53
commit 2a5ec404d1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/simulation2/components/CCmpRangeManager.cpp
View File

@ -859,7 +859,7 @@ public:
if (added.empty() && removed.empty())
continue;
std::sort(added.begin(), added.end(), EntityDistanceOrdering(m_EntityData, cmpSourcePosition->GetPosition2D()));
std::stable_sort(added.begin(), added.end(), EntityDistanceOrdering(m_EntityData, cmpSourcePosition->GetPosition2D()));
messages.resize(messages.size() + 1);
std::pair<entity_id_t, CMessageRangeUpdate>& back = messages.back();

6
source/simulation2/helpers/Spatial.h
View File

@ -86,8 +86,10 @@ class SpatialSubdivision
int dsti = out.count; // the index in [out] where to start copying
int count = (int)items.size();
if ((dsti + count) > SpatialQueryArray::MAX_COUNT)
count = SpatialQueryArray::MAX_COUNT - dsti; // silently fail to copy overflowing items
{
debug_warn("SpatialSubdivision Query too large. Results truncated.");
count = SpatialQueryArray::MAX_COUNT - dsti; // don't copy overflowing items
}
uint32_t* dst = &out.items[dsti];
uint32_t* src = &items[0];
for (int i = 0; i < count; ++i) // copy all items