Silence compiler warnings

jconway · jconway · commit 7911e78f6cc5 · 2017-01-02T14:11:50.000-08:00
In GetCachedPlan(), initialize 'plan' to silence a compiler warning, but also add an Assert() to make sure we don't ever actually fall through with 'plan' still being set to NULL, since we are about to dereference it. Back-patch back to 9.2. Author: Stephen Frost Discussion: https://postgr.es/m/20161129152102.GR13284%40tamriel.snowman.net
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
@@ -1141,7 +1141,7 @@ CachedPlan *
 GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,
 			  bool useResOwner)
 {
-	CachedPlan *plan;
+	CachedPlan *plan = NULL;
 	List	   *qlist;
 	bool		customplan;
 
@@ -1223,6 +1223,8 @@ GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,
 		}
 	}
 
+	Assert(plan != NULL);
+
 	/* Flag the plan as in use by caller */
 	if (useResOwner)
 		ResourceOwnerEnlargePlanCacheRefs(CurrentResourceOwner);

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ CachedPlan *`
`1141`	`1141`	`GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,`
`1142`	`1142`	`bool useResOwner)`
`1143`	`1143`	`{`
`1144`		`- CachedPlan *plan;`
	`1144`	`+ CachedPlan *plan = NULL;`
`1145`	`1145`	`List *qlist;`
`1146`	`1146`	`bool customplan;`
`1147`	`1147`
`@@ -1223,6 +1223,8 @@ GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,`
`1223`	`1223`	`}`
`1224`	`1224`	`}`
`1225`	`1225`
	`1226`	`+ Assert(plan != NULL);`
	`1227`	`+`
`1226`	`1228`	`/* Flag the plan as in use by caller */`
`1227`	`1229`	`if (useResOwner)`
`1228`	`1230`	`ResourceOwnerEnlargePlanCacheRefs(CurrentResourceOwner);`