diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/opt.c | 19 | ||||
| -rw-r--r-- | src/xspawn.c | 4 |
2 files changed, 14 insertions, 9 deletions
@@ -1623,14 +1623,19 @@ static void data_flow_icmp(struct bfs_opt *opt, const struct bfs_expr *expr, enu /** Transfer function for -{execut,read,writ}able. */ static struct bfs_expr *data_flow_access(struct bfs_opt *opt, struct bfs_expr *expr, const struct visitor *visitor) { - if (expr->num & R_OK) { + switch (expr->num) { + case R_OK: data_flow_pred(opt, READABLE_PRED, true); - } - if (expr->num & W_OK) { + break; + case W_OK: data_flow_pred(opt, WRITABLE_PRED, true); - } - if (expr->num & X_OK) { + break; + case X_OK: data_flow_pred(opt, EXECUTABLE_PRED, true); + break; + default: + bfs_bug("Unknown access() mode %lld", expr->num); + break; } return expr; @@ -1655,7 +1660,7 @@ static struct bfs_expr *data_flow_gid(struct bfs_opt *opt, struct bfs_expr *expr gid_t gid = range->min; bool nogroup = !bfs_getgrgid(opt->ctx->groups, gid); if (errno == 0) { - data_flow_pred(opt, NOGROUP_PRED, nogroup); + constrain_pred(&opt->after_true.preds[NOGROUP_PRED], nogroup); } } @@ -1729,7 +1734,7 @@ static struct bfs_expr *data_flow_uid(struct bfs_opt *opt, struct bfs_expr *expr uid_t uid = range->min; bool nouser = !bfs_getpwuid(opt->ctx->users, uid); if (errno == 0) { - data_flow_pred(opt, NOUSER_PRED, nouser); + constrain_pred(&opt->after_true.preds[NOUSER_PRED], nouser); } } diff --git a/src/xspawn.c b/src/xspawn.c index cf31cc9..ee62c05 100644 --- a/src/xspawn.c +++ b/src/xspawn.c @@ -246,8 +246,8 @@ int bfs_spawn_addfchdir(struct bfs_spawn *ctx, int fd) { #if __APPLE__ // macOS has a bug that causes EBADF when an fchdir() action refers to a // file opened by the file actions - for_slist (struct bfs_spawn_action, action, ctx) { - if (fd == action->out_fd) { + for_slist (struct bfs_spawn_action, prev, ctx) { + if (fd == prev->out_fd) { bfs_spawn_clear_posix(ctx); break; } |