set_deparse_plan: Reuse variable to appease Coverity

alvherre · alvherre · commit e70813fbc4aa · 2022-04-20T11:44:08.000+02:00
Coverity complains that dpns->outer_plan is deferenced (to obtain ->targetlist) when possibly NULL. We can avoid this by using dpns->outer_tlist instead, which was already obtained a few lines up. The fact that we end up with dpns->inner_tlist = dpns->outer_tlist is a bit suspicious-looking and maybe worthy of more investigation, but I'll leave that for another day. Reviewed-by: Michaël Paquier <michael@paquier.xyz> Discussion: https://postgr.es/m/202204191345.qerjy3kxi3eb@alvherre.pgsql
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
@@ -4996,7 +4996,7 @@ set_deparse_plan(deparse_namespace *dpns, Plan *plan)
 	if (IsA(plan, ModifyTable))
 	{
 		if (((ModifyTable *) plan)->operation == CMD_MERGE)
-			dpns->inner_tlist = dpns->outer_plan->targetlist;
+			dpns->inner_tlist = dpns->outer_tlist;
 		else
 			dpns->inner_tlist = ((ModifyTable *) plan)->exclRelTlist;
 	}

Original file line number	Diff line number	Diff line change
`@@ -4996,7 +4996,7 @@ set_deparse_plan(deparse_namespace dpns, Plan plan)`
`4996`	`4996`	`if (IsA(plan, ModifyTable))`
`4997`	`4997`	`{`
`4998`	`4998`	`if (((ModifyTable *) plan)->operation == CMD_MERGE)`
`4999`		`- dpns->inner_tlist = dpns->outer_plan->targetlist;`
	`4999`	`+ dpns->inner_tlist = dpns->outer_tlist;`
`5000`	`5000`	`else`
`5001`	`5001`	`dpns->inner_tlist = ((ModifyTable *) plan)->exclRelTlist;`
`5002`	`5002`	`}`