ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2025-04-07 11:08:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't compare past the end of the parent key

Browse Source
This commit is contained in:
Jeremy Lakeman 2014-05-09 15:01:33 +09:30
parent 672104bdd8
commit 2a07093c5f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
conf_om.c
View File

@ -180,13 +180,17 @@ int cf_om_add_child(struct cf_om_node **const parentp, const char *const key)
int cf_om_get_child(const struct cf_om_node *parent, const char *key, const char *keyend)
{
if (keyend == NULL)
keyend = key + strlen(key);
// TODO: use binary search, since child nodes are already sorted by key
unsigned i;
for (i = 0; i < parent->nodc; ++i)
if (memcmp(parent->nodv[i]->key, key, keyend - key) == 0 && parent->nodv[i]->key[keyend - key] == '\0')
return i;
for (i = 0; i < parent->nodc; ++i){
if (keyend){
if (strncmp(parent->nodv[i]->key, key, keyend - key)==0)
return i;
}else{
if (strcmp(parent->nodv[i]->key, key)==0)
return i;
}
}
return -1;
}