marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset the size of a C4Set in Clear() 

This bug manifested itself in mysteriously growing PropLists with nil keys.

Some usages of Clear were simply to clean the newly-allocated table, and
need to continue to do so.
epoxy
Günther Brammer 2016-01-25 00:54:58 +01:00
parent 08f1037866
commit 79043c8424
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/script/C4StringTable.h
View File

@ -125,6 +125,11 @@ template<typename T> class C4Set
*p = std::move(e);
return p;
}
void ClearTable()
{
for (unsigned int i = 0; i < Capacity; ++i)
Table[i] = 0;
}
void MaintainCapacity()
{
if (Capacity - Size < std::max(2u, Capacity / 4))
@ -133,7 +138,7 @@ template<typename T> class C4Set
Capacity *= 2;
T * OTable = Table;
Table = new T[Capacity];
Clear();
ClearTable();
for (unsigned int i = 0; i < OCapacity; ++i)
{
if (OTable[i])
@ -148,7 +153,7 @@ public:
static bool Equals(const T & a, const T & b) { return a == b; }
C4Set(): Capacity(2), Size(0), Table(new T[Capacity])
{
Clear();
ClearTable();
}
~C4Set()
{
@ -171,8 +176,8 @@ public:
void CompileFunc(StdCompiler *pComp, C4ValueNumbers *);
void Clear()
{
for (unsigned int i = 0; i < Capacity; ++i)
Table[i] = 0;
ClearTable();
Size = 0;
}
template<typename H> T & Get(H e) const
{