1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence compiler warnings

Browse Source 
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
This commit is contained in:
Joe Conway 2017-01-02 14:12:04 -08:00
parent 4191b9ece4
commit 35d4dd82c2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/utils/cache/plancache.c vendored
View File

@ -1125,7 +1125,7 @@ CachedPlan *
GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,
bool useResOwner)
{
CachedPlan *plan;
CachedPlan *plan = NULL;
List *qlist;
bool customplan;
@ -1207,6 +1207,8 @@ GetCachedPlan(CachedPlanSource *plansource, ParamListInfo boundParams,
}
}
Assert(plan != NULL);
/* Flag the plan as in use by caller */
if (useResOwner)
ResourceOwnerEnlargePlanCacheRefs(CurrentResourceOwner);