diff options
| author | Joe Conway <mail@joeconway.com> | 2017-01-02 14:11:50 -0800 |
|---|---|---|
| committer | Joe Conway <mail@joeconway.com> | 2017-01-02 14:11:50 -0800 |
| commit | 7911e78f6cc5a51f4d41589542140eee00b3f10d (patch) | |
| tree | 3896b6090c79905228415e1335578093c9071973 | |
| parent | f7e7d6fcefc4083d929075be5e121114086a6f98 (diff) | |
| download | postgresql-7911e78f6cc5a51f4d41589542140eee00b3f10d.tar.gz postgresql-7911e78f6cc5a51f4d41589542140eee00b3f10d.zip | |
Silence compiler warnings
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
| -rw-r--r-- | src/backend/utils/cache/plancache.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c index c96a86500ad..6132856f049 100644 --- 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); |