Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-04-28 21:57:57 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed defaultEntry having a NULL value even if there are elements

Browse source
This commit is contained in:
smallmodel 2023-11-28 20:13:55 +01:00
parent e07dda6991
commit f0c38305b5
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
1 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

28
code/qcommon/con_set.h
View file

@ -285,28 +285,25 @@ template<typename k, typename v>
typename con_set<k, v>::Entry *con_set<k, v>::addNewKeyEntry(const k& key)
{
Entry *entry;
int index;
int hash;
if (count >= threshold) {
resize();
}
index = HashCode<k>(key) % tableLength;
count++;
entry = new Entry;
entry->SetKey(key);
hash = HashCode<k>(entry->GetKey()) % tableLength;
if (defaultEntry == NULL) {
defaultEntry = entry;
entry->next = NULL;
} else {
entry->next = table[index];
entry->next = table[hash];
}
entry->SetKey(key);
table[index] = entry;
table[hash] = entry;
return entry;
}
@ -321,8 +318,9 @@ template<typename k, typename v>
bool con_set<k, v>::remove(const k& key)
{
int hash;
int i;
Entry *prev = NULL;
Entry *entry;
Entry *entry, *e;
hash = HashCode<k>(key) % tableLength;
@ -334,7 +332,15 @@ bool con_set<k, v>::remove(const k& key)
}
if (defaultEntry == entry) {
defaultEntry = prev;
defaultEntry = prev ? prev : table[hash];
// find a default entry
for (i = 0; i < tableLength && !defaultEntry; i++) {
for (e = table[i]; e; e = e->next) {
if (e == entry) { continue; }
defaultEntry = e;
break;
}
}
}
if (prev) {