1
0
mirror of https://github.com/postgres/postgres.git synced 2025-06-13 07:41:39 +03:00

Verify range bounds to bms_add_range when necessary

Now that the bms_add_range boundary protections are gone, some
alternative ones are needed in a few places.

Author: Amit Langote <Langote_Amit_f8@lab.ntt.co.jp>
Discussion: https://postgr.es/m/3437ccf8-a144-55ff-1e2f-fc16b437823b@lab.ntt.co.jp
This commit is contained in:
Alvaro Herrera
2018-07-30 17:03:19 -04:00
parent 1b68010518
commit d25d45e4d9
3 changed files with 21 additions and 0 deletions

View File

@ -171,6 +171,7 @@ ExecInitAppend(Append *node, EState *estate, int eflags)
{
/* We'll need to initialize all subplans */
nplans = list_length(node->appendplans);
Assert(nplans > 0);
validsubplans = bms_add_range(NULL, 0, nplans - 1);
}
@ -179,7 +180,10 @@ ExecInitAppend(Append *node, EState *estate, int eflags)
* immediately, preventing later calls to ExecFindMatchingSubPlans.
*/
if (!prunestate->do_exec_prune)
{
Assert(nplans > 0);
appendstate->as_valid_subplans = bms_add_range(NULL, 0, nplans - 1);
}
}
else
{
@ -189,6 +193,7 @@ ExecInitAppend(Append *node, EState *estate, int eflags)
* When run-time partition pruning is not enabled we can just mark all
* subplans as valid; they must also all be initialized.
*/
Assert(nplans > 0);
appendstate->as_valid_subplans = validsubplans =
bms_add_range(NULL, 0, nplans - 1);
appendstate->as_prune_state = NULL;