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

Quiet a few harmless cppcheck warnings.

Browse Source
This commit is contained in:
Todd C. Miller
2021-01-06 13:01:10 -07:00
parent 84b3a1dae1
commit 92c88d4105
9 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/editor.c
View File

@@ -123,7 +123,7 @@ resolve_editor(const char *ed, size_t edlen, int nfiles, char **files,
int *argc_out, char ***argv_out, char * const *allowlist) int *argc_out, char ***argv_out, char * const *allowlist)
{ {
char **nargv = NULL, *editor = NULL, *editor_path = NULL; char **nargv = NULL, *editor = NULL, *editor_path = NULL;
const char *cp, *ep, *tmp; const char *tmp, *cp, *ep = NULL;
const char *edend = ed + edlen; const char *edend = ed + edlen;
struct stat user_editor_sb; struct stat user_editor_sb;
int nargc; int nargc;

2
plugins/sudoers/fmtsudoers.c
View File

@@ -177,7 +177,7 @@ sudoers_defaults_list_to_tags(struct defaults_list *defs, struct cmndtag *tags)
struct defaults *d; struct defaults *d;
debug_decl(sudoers_defaults_list_to_tags, SUDOERS_DEBUG_UTIL); debug_decl(sudoers_defaults_list_to_tags, SUDOERS_DEBUG_UTIL);
TAGS_INIT(*tags); TAGS_INIT(tags);
if (defs != NULL) { if (defs != NULL) {
TAILQ_FOREACH(d, defs, entries) { TAILQ_FOREACH(d, defs, entries) {
if (!sudoers_defaults_to_tags(d->var, d->val, d->op, tags)) { if (!sudoers_defaults_to_tags(d->var, d->val, d->op, tags)) {

2
plugins/sudoers/gram.c
View File

@@ -2565,7 +2565,7 @@ yyreduce:
case 92: /* cmndtag: %empty */ case 92: /* cmndtag: %empty */
#line 785 "gram.y" #line 785 "gram.y"
{ {
TAGS_INIT((yyval.tag)); TAGS_INIT(&(yyval.tag));
} }
#line 2565 "gram.c" #line 2565 "gram.c"
break; break;

2
plugins/sudoers/gram.y
View File

@@ -783,7 +783,7 @@ options : /* empty */ {
; ;
cmndtag : /* empty */ { cmndtag : /* empty */ {
TAGS_INIT($$); TAGS_INIT(&$$);
} }
| cmndtag NOPASSWD { | cmndtag NOPASSWD {
$$.nopasswd = true; $$.nopasswd = true;

2
plugins/sudoers/ldap_util.c
View File

@@ -458,7 +458,7 @@ sudo_ldap_role_to_priv(const char *cn, void *hosts, void *runasusers,
TAILQ_INSERT_TAIL(&priv->cmndlist, cmndspec, entries); TAILQ_INSERT_TAIL(&priv->cmndlist, cmndspec, entries);
/* Initialize cmndspec */ /* Initialize cmndspec */
TAGS_INIT(cmndspec->tags); TAGS_INIT(&cmndspec->tags);
cmndspec->notbefore = UNSPEC; cmndspec->notbefore = UNSPEC;
cmndspec->notafter = UNSPEC; cmndspec->notafter = UNSPEC;
cmndspec->timeout = UNSPEC; cmndspec->timeout = UNSPEC;

14
plugins/sudoers/parse.h
View File

@@ -42,13 +42,13 @@
* Initialize all tags to UNSPEC. * Initialize all tags to UNSPEC.
*/ */
#define TAGS_INIT(t) do { \ #define TAGS_INIT(t) do { \
(t).follow = UNSPEC; \ (t)->follow = UNSPEC; \
(t).log_input = UNSPEC; \ (t)->log_input = UNSPEC; \
(t).log_output = UNSPEC; \ (t)->log_output = UNSPEC; \
(t).noexec = UNSPEC; \ (t)->noexec = UNSPEC; \
(t).nopasswd = UNSPEC; \ (t)->nopasswd = UNSPEC; \
(t).send_mail = UNSPEC; \ (t)->send_mail = UNSPEC; \
(t).setenv = UNSPEC; \ (t)->setenv = UNSPEC; \
} while (0) } while (0)
/* /*

6
plugins/sudoers/starttime.c
View File

@@ -98,7 +98,7 @@ get_starttime(pid_t pid, struct timespec *starttime)
mib[3] = (int)pid; mib[3] = (int)pid;
mib[4] = sizeof(*ki_proc); mib[4] = sizeof(*ki_proc);
mib[5] = 1; mib[5] = 1;
do { for (;;) {
struct sudo_kinfo_proc *kp; struct sudo_kinfo_proc *kp;
size += size / 10; size += size / 10;
@@ -108,7 +108,9 @@ get_starttime(pid_t pid, struct timespec *starttime)
} }
ki_proc = kp; ki_proc = kp;
rc = sysctl(mib, sudo_kp_namelen, ki_proc, &size, NULL, 0); rc = sysctl(mib, sudo_kp_namelen, ki_proc, &size, NULL, 0);
} while (rc == -1 && errno == ENOMEM); if (rc != -1 || errno != ENOMEM)
break;
}
if (rc != -1) { if (rc != -1) {
#if defined(HAVE_KINFO_PROC_FREEBSD) #if defined(HAVE_KINFO_PROC_FREEBSD)
/* FreeBSD and Dragonfly */ /* FreeBSD and Dragonfly */

5
plugins/sudoers/tsgetgrpw.c
View File

@@ -356,8 +356,7 @@ sudo_getgrouplist2_v1(const char *name, GETGROUPS_T basegid,
GETGROUPS_T **groupsp, int *ngroupsp) GETGROUPS_T **groupsp, int *ngroupsp)
{ {
GETGROUPS_T *groups = *groupsp; GETGROUPS_T *groups = *groupsp;
int grpsize = *ngroupsp; int i, grpsize, ngroups = 1;
int i, ngroups = 1;
int ret = -1; int ret = -1;
struct group *grp; struct group *grp;
@@ -372,7 +371,7 @@ sudo_getgrouplist2_v1(const char *name, GETGROUPS_T basegid,
grpsize <<= 2; grpsize <<= 2;
} else { } else {
/* Static group vector. */ /* Static group vector. */
if (grpsize < 1) if ((grpsize = *ngroupsp) < 1)
return -1; return -1;
} }

6
src/ttyname.c
View File

@@ -111,7 +111,7 @@ get_process_ttyname(char *name, size_t namelen)
mib[3] = (int)getpid(); mib[3] = (int)getpid();
mib[4] = sizeof(*ki_proc); mib[4] = sizeof(*ki_proc);
mib[5] = 1; mib[5] = 1;
do { for (;;) {
struct sudo_kinfo_proc *kp; struct sudo_kinfo_proc *kp;
size += size / 10; size += size / 10;
@@ -121,7 +121,9 @@ get_process_ttyname(char *name, size_t namelen)
} }
ki_proc = kp; ki_proc = kp;
rc = sysctl(mib, sudo_kp_namelen, ki_proc, &size, NULL, 0); rc = sysctl(mib, sudo_kp_namelen, ki_proc, &size, NULL, 0);
} while (rc == -1 && errno == ENOMEM); if (rc != -1 || errno != ENOMEM)
break;
}
errno = ENOENT; errno = ENOENT;
if (rc != -1) { if (rc != -1) {
if ((dev_t)ki_proc->sudo_kp_tdev != (dev_t)-1) { if ((dev_t)ki_proc->sudo_kp_tdev != (dev_t)-1) {