emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

0005-pgrep: Simplify the match_*() functions.

Browse Source
This commit is contained in:
Qualys Security Advisory
-
committed by Craig Small
parent 8e3e77910d
commit ac85587773
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pgrep.c
View File

@ -375,13 +375,13 @@ static int conv_ns (const char *restrict name, struct el *restrict e)
static int match_numlist (long value, const struct el *restrict list) static int match_numlist (long value, const struct el *restrict list)
{ {
int found = 0; int found = 0;
if (list == NULL) if (list != NULL) {
found = 0;
else {
int i; int i;
for (i = list[0].num; i > 0; i--) { for (i = list[0].num; i > 0; i--) {
if (list[i].num == value) if (list[i].num == value) {
found = 1; found = 1;
break;
}
} }
} }
return found; return found;
@ -390,13 +390,13 @@ static int match_numlist (long value, const struct el *restrict list)
static int match_strlist (const char *restrict value, const struct el *restrict list) static int match_strlist (const char *restrict value, const struct el *restrict list)
{ {
int found = 0; int found = 0;
if (list == NULL) if (list != NULL) {
found = 0;
else {
int i; int i;
for (i = list[0].num; i > 0; i--) { for (i = list[0].num; i > 0; i--) {
if (! strcmp (list[i].str, value)) if (! strcmp (list[i].str, value)) {
found = 1; found = 1;
break;
}
} }
} }
return found; return found;
@ -414,11 +414,12 @@ static int match_ns (const int pid,
_("Unable to read process namespace information")); _("Unable to read process namespace information"));
for (i = 0; i < PROCPS_NS_COUNT; i++) { for (i = 0; i < PROCPS_NS_COUNT; i++) {
if (ns_flags & (1 << i)) { if (ns_flags & (1 << i)) {
if (proc_ns.ns[i] != match_ns->ns[i]) if (proc_ns.ns[i] != match_ns->ns[i]) {
found = 0; found = 0;
break;
}
} }
} }
return found; return found;
} }