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

Prevent "testsudoers -d username" from trying to malloc(0).

Browse Source
This commit is contained in:
Todd C. Miller
2011-11-07 08:44:05 -05:00
parent a83507ccd1
commit cf7ad29f49
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sudoers/testsudoers.c
View File

@@ -190,11 +190,12 @@ main(int argc, char *argv[])
if (argc < 2) { if (argc < 2) {
if (!dflag) if (!dflag)
usage(); usage();
user_name = "root"; user_name = argc ? *argv++ : "root";
user_cmnd = user_base = "true"; user_cmnd = user_base = "true";
argc = 0;
} else { } else {
user_name = *argv; user_name = *argv++;
user_cmnd = *++argv; user_cmnd = *argv++;
if ((p = strrchr(user_cmnd, '/')) != NULL) if ((p = strrchr(user_cmnd, '/')) != NULL)
user_base = p + 1; user_base = p + 1;
else else
@@ -223,11 +224,11 @@ main(int argc, char *argv[])
char *to, **from; char *to, **from;
size_t size, n; size_t size, n;
for (size = 0, from = argv + 1; *from; from++) for (size = 0, from = argv; *from; from++)
size += strlen(*from) + 1; size += strlen(*from) + 1;
user_args = (char *) emalloc(size); user_args = (char *) emalloc(size);
for (to = user_args, from = argv + 1; *from; from++) { for (to = user_args, from = argv; *from; from++) {
n = strlcpy(to, *from, size - (to - user_args)); n = strlcpy(to, *from, size - (to - user_args));
if (n >= size - (to - user_args)) if (n >= size - (to - user_args))
errorx(1, _("internal error, init_vars() overflow")); errorx(1, _("internal error, init_vars() overflow"));