NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit9089287

committed

Guard against null plan pointer in CachedPlanIsSimplyValid().

If both the passed-in plan pointer and plansource->gplan areNULL, CachedPlanIsSimplyValid would think that the plan pointeris possibly-valid and try to dereference it. For the one extantcall site in plpgsql, this situation doesn't normally happenwhich is why we've not noticed. However, it appears to be possibleif the previous use of the cached plan failed, as per report fromJustin Pryzby. Add an extra check to prevent crashing.Back-patch to v13 where this code was added.Discussion:https://postgr.es/m/ZLlV+STFz1l/WhAQ@telsasoft.com

1 parent29a0ccb commit9089287Copy full SHA for 9089287

File tree

1 file changed

-1

lines changed

src/backend/utils/cache
- plancache.c

1 file changed

-1

lines changed

`‎src/backend/utils/cache/plancache.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1440,7 +1440,9 @@ CachedPlanIsSimplyValid(CachedPlanSource plansource, CachedPlan plan,`
`1440`	`1440`	`* that here we do check plansource->is_valid, so as to force plan`
`1441`	`1441`	`* rebuild if that's become false.`
`1442`	`1442`	`*/`
`1443`		`-if (!plansource->is_valid\|\|plan!=plansource->gplan\|\| !plan->is_valid)`
	`1443`	`+if (!plansource->is_valid\|\|`
	`1444`	`+plan==NULL\|\|plan!=plansource->gplan\|\|`
	`1445`	`+!plan->is_valid)`
`1444`	`1446`	`return false;`
`1445`	`1447`
`1446`	`1448`	`Assert(plan->magic==CACHEDPLAN_MAGIC);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit9089287

File tree

1 file changed

1 file changed

`‎src/backend/utils/cache/plancache.c`

0 commit comments