mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-08-31 12:17:23 +02:00
Avoid crash in eval_const_expressions if a Param's type changes.
Since commit 6719b238e
it's been possible for the values of plpgsql
record field variables to be exposed to the planner as Params.
(Before that, plpgsql never supplied values for such variables during
planning, so that the problematic code wasn't reached.) Other places
that touch potentially-type-mutable Params either cope gracefully or
do runtime-test-and-ereport checks that the type is what they expect.
But eval_const_expressions() just had an Assert, meaning that it either
failed the assertion or risked crashes due to using an incompatible
value.
In this case, rather than throwing an ereport immediately, we can just
not perform a const-substitution in case of a mismatch. This seems
important for the same reason that the Param fetch was speculative:
we might not actually reach this part of the expression at runtime.
Test case will follow in a separate commit.
Patch by me, pursuant to bug report from Andrew Gierth.
Back-patch to v11 where the previous commit appeared.
Discussion: https://postgr.es/m/87wotkfju1.fsf@news-spur.riddles.org.uk
This commit is contained in:
parent
ed7e319eb4
commit
9207a64e14
@ -2567,7 +2567,14 @@ eval_const_expressions_mutator(Node *node,
|
||||
else
|
||||
prm = ¶mLI->params[param->paramid - 1];
|
||||
|
||||
if (OidIsValid(prm->ptype))
|
||||
/*
|
||||
* We don't just check OidIsValid, but insist that the
|
||||
* fetched type match the Param, just in case the hook did
|
||||
* something unexpected. No need to throw an error here
|
||||
* though; leave that for runtime.
|
||||
*/
|
||||
if (OidIsValid(prm->ptype) &&
|
||||
prm->ptype == param->paramtype)
|
||||
{
|
||||
/* OK to substitute parameter value? */
|
||||
if (context->estimate ||
|
||||
@ -2583,7 +2590,6 @@ eval_const_expressions_mutator(Node *node,
|
||||
bool typByVal;
|
||||
Datum pval;
|
||||
|
||||
Assert(prm->ptype == param->paramtype);
|
||||
get_typlenbyval(param->paramtype,
|
||||
&typLen, &typByVal);
|
||||
if (prm->isnull || typByVal)
|
||||
|
Loading…
Reference in New Issue
Block a user