isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use non-exiting allocators in the redblack tree and fix the fallout.

Browse Source 
Also switch to non-exiting allocators in affected code blocks.
This commit is contained in:
Todd C. Miller
2015-05-27 09:51:54 -06:00
parent 46770c9588
commit 2bf454b74d
12 changed files with 194 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sudoers/alias.c
View File

@@ -132,10 +132,15 @@ alias_add(char *name, int type, struct member *members)
a->type = type;
/* a->used = false; */
HLTQ_TO_TAILQ(&a->members, members, entries);
if (rbinsert(aliases, a)) {
switch (rbinsert(aliases, a, NULL)) {
case 1:
snprintf(errbuf, sizeof(errbuf), N_("Alias `%s' already defined"), name);
alias_free(a);
debug_return_str(errbuf);
case -1:
strlcpy(errbuf, N_("unable to allocate memory"), sizeof(errbuf));
alias_free(a);
debug_return_str(errbuf);
}
debug_return_str(NULL);
}
@@ -209,7 +214,7 @@ alias_remove(char *name, int type)
debug_return_ptr(rbdelete(aliases, node));
}
void
bool
init_aliases(void)
{
debug_decl(init_aliases, SUDOERS_DEBUG_ALIAS)
@@ -218,5 +223,5 @@ init_aliases(void)
rbdestroy(aliases, alias_free);
aliases = rbcreate(alias_compare);
debug_return;
debug_return_bool(aliases != NULL);
}