godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PoolAllocator::resize for too large p_new_size 

The code had a subtle signed/unsigned bug -
```cpp
if( signed - unsigned < 0)
// signed - unsigned is unsigned in c++, so
if( unsigned < 0)
// and thus the if block will never be executed
```

Thus all the following code would be ran, including unnecessary retries
of compacting the pool.

(cherry picked from commit 2bbe6144ff)
This commit is contained in:
nemerle 2018-05-17 00:35:47 +02:00 committed by Rémi Verschelde
parent 761bfb156d
commit 13a90fdd89
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/pool_allocator.cpp
View File

@ -359,7 +359,7 @@ Error PoolAllocator::resize(ID p_mem, int p_new_size) {
//p_new_size = align(p_new_size) //p_new_size = align(p_new_size)
int _free = free_mem; // - static_area_size; int _free = free_mem; // - static_area_size;
if ((_free + aligned(e->len)) - alloc_size < 0) { if (uint32_t(_free + aligned(e->len)) < alloc_size) {
mt_unlock(); mt_unlock();
ERR_FAIL_V(ERR_OUT_OF_MEMORY); ERR_FAIL_V(ERR_OUT_OF_MEMORY);
}; };