UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed a series of addressing bugs where the indexer could reach past basearray bounds

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%40199
This commit is contained in:
David Anderson 2006-12-07 08:17:19 +00:00
parent eabc33b4d2
commit 5fc2918377
1 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
core/sm_trie.cpp
View File

@ -290,7 +290,7 @@ bool sm_trie_retrieve(Trie *trie, const char *key, void **value)
keyptr++; keyptr++;
/* Check if this slot is supposed to be empty or is a collision */ /* Check if this slot is supposed to be empty or is a collision */
if (node->mode == Node_Unused || node->parent != lastidx) if ((curidx > trie->baseSize) || node->mode == Node_Unused || node->parent != lastidx)
{ {
return false; return false;
} else if (node->mode == Node_Term) { } else if (node->mode == Node_Term) {
@ -349,12 +349,24 @@ bool sm_trie_insert(Trie *trie, const char *key, void *value)
/* Check if this slot is supposed to be empty. If so, we need to handle CASES 1/2: /* Check if this slot is supposed to be empty. If so, we need to handle CASES 1/2:
* Insertion without collisions * Insertion without collisions
*/ */
if (node->mode == Node_Unused) if ( (curidx > trie->baseSize) || (node->mode == Node_Unused) )
{ {
/* Assign backcheck reference */ if (curidx > trie->baseSize)
{
if (!sm_trie_grow(trie))
{
return false;
}
node = &trie->base[curidx];
}
node->parent = lastidx; node->parent = lastidx;
node->idx = x_addstring(trie, keyptr); if (*keyptr == '\0')
node->mode = Node_Term; {
node->mode = Node_Arc;
} else {
node->idx = x_addstring(trie, keyptr);
node->mode = Node_Term;
}
node->valset = true; node->valset = true;
node->value = value; node->value = value;
@ -383,7 +395,14 @@ bool sm_trie_insert(Trie *trie, const char *key, void *value)
unsigned int outgoing_list[256]; unsigned int outgoing_list[256];
unsigned int outgoing_count = 0; /* count the current index here */ unsigned int outgoing_count = 0; /* count the current index here */
cur = &base[outgoing_base] + 1; cur = &base[outgoing_base] + 1;
for (unsigned int i=1; i<=255; i++,cur++) unsigned int outgoing_limit = 255;
if (outgoing_base + outgoing_limit > trie->baseSize)
{
outgoing_limit = trie->baseSize - outgoing_base;
}
for (unsigned int i=1; i<=outgoing_limit; i++,cur++)
{ {
if (cur->mode == Node_Unused || cur->parent != lastidx) if (cur->mode == Node_Unused || cur->parent != lastidx)
{ {
@ -400,7 +419,14 @@ bool sm_trie_insert(Trie *trie, const char *key, void *value)
unsigned int incoming_list[256]; unsigned int incoming_list[256];
unsigned int incoming_base = base[node->parent].idx; unsigned int incoming_base = base[node->parent].idx;
unsigned int incoming_count = 0; unsigned int incoming_count = 0;
unsigned int incoming_limit = 255;
cur = &base[incoming_base] + 1; cur = &base[incoming_base] + 1;
if (incoming_base + incoming_limit > trie->baseSize)
{
incoming_limit = trie->baseSize - incoming_limit;
}
for (unsigned int i=1; i<=255; i++,cur++) for (unsigned int i=1; i<=255; i++,cur++)
{ {
if (cur->mode == Node_Arc || cur->mode == Node_Term) if (cur->mode == Node_Arc || cur->mode == Node_Term)
@ -437,6 +463,7 @@ bool sm_trie_insert(Trie *trie, const char *key, void *value)
lastidx = newidx; lastidx = newidx;
} }
base[newidx] = base[oldidx]; base[newidx] = base[oldidx];
assert(base[base[newidx].parent].mode == Node_Arc);
memset(&base[oldidx], 0, sizeof(TrieNode)); memset(&base[oldidx], 0, sizeof(TrieNode));
/* If we are not a terminator, we have children we must take care of */ /* If we are not a terminator, we have children we must take care of */
if (base[newidx].mode == Node_Arc) if (base[newidx].mode == Node_Arc)
@ -480,6 +507,7 @@ bool sm_trie_insert(Trie *trie, const char *key, void *value)
lastidx = newidx; lastidx = newidx;
} }
base[newidx] = base[oldidx]; base[newidx] = base[oldidx];
assert(base[base[newidx].parent].mode == Node_Arc);
memset(&base[oldidx], 0, sizeof(TrieNode)); memset(&base[oldidx], 0, sizeof(TrieNode));
/* If we are not a terminator, we have children we must take care of */ /* If we are not a terminator, we have children we must take care of */
if (base[newidx].mode == Node_Arc) if (base[newidx].mode == Node_Arc)