From 45dc484a25f234722f6b0fe4f8fc12080429a1dd Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 11 Aug 2022 23:01:42 -0400 Subject: [PATCH] e2fsck: streamline problem latch handling No functional changes, but streamline the logic, and avoid a coverity warning. Addresses-Coverity-Bug: 1507763 Signed-off-by: Theodore Ts'o --- e2fsck/problem.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/e2fsck/problem.c b/e2fsck/problem.c index 95f0ace..e2572f5 100644 --- a/e2fsck/problem.c +++ b/e2fsck/problem.c @@ -2494,8 +2494,7 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx) if ((ctx->options & E2F_OPT_PREEN) && (ptr->flags & PR_PREEN_OK)) suppress++; - if ((ptr->flags & PR_LATCH_MASK) && - (ldesc->flags & (PRL_YES | PRL_NO))) + if (ldesc && (ldesc->flags & (PRL_YES | PRL_NO))) suppress++; if (ptr->count == ptr->max_count + 1) { if (ctx->problem_logf) @@ -2540,8 +2539,7 @@ int fix_problem(e2fsck_t ctx, problem_t code, struct problem_context *pctx) answer = def_yn; if (!(ptr->flags & PR_PREEN_NOMSG)) print_answer = 1; - } else if ((ptr->flags & PR_LATCH_MASK) && - (ldesc->flags & (PRL_YES | PRL_NO))) { + } else if (ldesc && (ldesc->flags & (PRL_YES | PRL_NO))) { print_answer = 1; if (ldesc->flags & PRL_YES) answer = 1; -- 1.8.3.1