From f737292205c671339f070ab86bd6ffbe68ffee25 Mon Sep 17 00:00:00 2001 From: naisila Date: Sun, 10 Nov 2024 23:15:59 +0300 Subject: [PATCH] Ruleutils_17 Suppress Coverity warnings about Asserts in get_name_for_var_field. Relevant PG commit: https://github.com/postgres/postgres/commit/aed881386aa6a6a542e46d14d3505e4e6f9310a0 aed881386aa6a6a542e46d14d3505e4e6f9310a0 --- src/backend/distributed/deparser/ruleutils_17.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/backend/distributed/deparser/ruleutils_17.c b/src/backend/distributed/deparser/ruleutils_17.c index f89e69696..777247b4a 100644 --- a/src/backend/distributed/deparser/ruleutils_17.c +++ b/src/backend/distributed/deparser/ruleutils_17.c @@ -4651,11 +4651,11 @@ get_name_for_var_field(Var *var, int fieldno, if (!dpns->inner_plan) { char *dummy_name = palloc(32); - Assert(IsA(dpns->plan, Result)); + Assert(dpns->plan && IsA(dpns->plan, Result)); snprintf(dummy_name, 32, "f%d", fieldno); return dummy_name; } - Assert(IsA(dpns->plan, SubqueryScan)); + Assert(dpns->plan && IsA(dpns->plan, SubqueryScan)); tle = get_tle_by_resno(dpns->inner_tlist, attnum); if (!tle) @@ -4781,12 +4781,12 @@ get_name_for_var_field(Var *var, int fieldno, if (!dpns->inner_plan) { char *dummy_name = palloc(32); - Assert(IsA(dpns->plan, Result)); + Assert(dpns->plan && IsA(dpns->plan, Result)); snprintf(dummy_name, 32, "f%d", fieldno); return dummy_name; } - Assert(IsA(dpns->plan, CteScan) || - IsA(dpns->plan, WorkTableScan)); + Assert(dpns->plan && (IsA(dpns->plan, CteScan) || + IsA(dpns->plan, WorkTableScan))); tle = get_tle_by_resno(dpns->inner_tlist, attnum); if (!tle)