mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14934) -Fix: in (extreme) cases CanAllocateItem could return true when there's not enough space.

release/0.7
rubidium 2009-01-09 15:00:22 +00:00
parent f0b0691bfe
commit 07c5fb2a02
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/oldpool_func.h
View File

@ -44,6 +44,7 @@ template<typename T, typename Tid, OldMemoryPool<T> *Tpool> T *PoolItem<T, Tid,
template<typename T, typename Tid, OldMemoryPool<T> *Tpool> bool PoolItem<T, Tid, Tpool>::CanAllocateItem(uint count) template<typename T, typename Tid, OldMemoryPool<T> *Tpool> bool PoolItem<T, Tid, Tpool>::CanAllocateItem(uint count)
{ {
uint last_minus_one = Tpool->GetSize() - 1; uint last_minus_one = Tpool->GetSize() - 1;
uint orig_count = count;
for (T *t = Tpool->Get(Tpool->first_free_index); count > 0 && t != NULL; t = ((uint)t->index < last_minus_one) ? Tpool->Get(t->index + 1U) : NULL) { for (T *t = Tpool->Get(Tpool->first_free_index); count > 0 && t != NULL; t = ((uint)t->index < last_minus_one) ? Tpool->Get(t->index + 1U) : NULL) {
if (!t->IsValid()) count--; if (!t->IsValid()) count--;
@ -52,7 +53,7 @@ template<typename T, typename Tid, OldMemoryPool<T> *Tpool> bool PoolItem<T, Tid
if (count == 0) return true; if (count == 0) return true;
/* Check if we can add a block to the pool */ /* Check if we can add a block to the pool */
if (Tpool->AddBlockToPool()) return CanAllocateItem(count); if (Tpool->AddBlockToPool()) return CanAllocateItem(orig_count);
return false; return false;
} }