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

Simplify the logic surrounding sudoers_args in command_args_match().

Browse Source 
We only need to check that sudoers_args is non-NULL once.
Found by PVS-Studio.
This commit is contained in:
Todd C. Miller
2018-10-18 14:24:55 -06:00
parent 54784a234c
commit c2d93b8c97
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/sudoers/match.c
View File

@@ -413,20 +413,18 @@ command_args_match(const char *sudoers_cmnd, const char *sudoers_args)
* If no args specified in sudoers, any user args are allowed. * If no args specified in sudoers, any user args are allowed.
* If the empty string is specified in sudoers, no user args are allowed. * If the empty string is specified in sudoers, no user args are allowed.
*/ */
if (!sudoers_args || if (!sudoers_args || (!user_args && !strcmp("\"\"", sudoers_args)))
(!user_args && sudoers_args && !strcmp("\"\"", sudoers_args)))
debug_return_bool(true); debug_return_bool(true);
/* /*
* If args are specified in sudoers, they must match the user args. * If args are specified in sudoers, they must match the user args.
* If running as sudoedit, all args are assumed to be paths. * If running as sudoedit, all args are assumed to be paths.
*/ */
if (sudoers_args) {
/* For sudoedit, all args are assumed to be pathnames. */
if (strcmp(sudoers_cmnd, "sudoedit") == 0) if (strcmp(sudoers_cmnd, "sudoedit") == 0)
flags = FNM_PATHNAME; flags = FNM_PATHNAME;
if (fnmatch(sudoers_args, user_args ? user_args : "", flags) == 0) if (fnmatch(sudoers_args, user_args ? user_args : "", flags) == 0)
debug_return_bool(true); debug_return_bool(true);
}
debug_return_bool(false); debug_return_bool(false);
} }