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

diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index 5ce4fb43e1a3caf83c61cb96c06af33d4c48ef20..86a68d30201e39d459ee70a3603656d89ec8d6b2 100644 (file)
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -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;

diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 64025733de537fbb820f27df3d7d63144af39975..be43014cb89a1c38f73856f1180b90e74e79613c 100644 (file)
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -131,6 +131,7 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
                {
                        /* We'll need to initialize all subplans */
                        nplans = list_length(node->mergeplans);
+                       Assert(nplans > 0);
                        validsubplans = bms_add_range(NULL, 0, nplans - 1);
                }
 
@@ -139,7 +140,10 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
                 * immediately, preventing later calls to ExecFindMatchingSubPlans.
                 */
                if (!prunestate->do_exec_prune)
+               {
+                       Assert(nplans > 0);
                        mergestate->ms_valid_subplans = bms_add_range(NULL, 0, nplans - 1);
+               }
        }
        else
        {
@@ -149,6 +153,7 @@ ExecInitMergeAppend(MergeAppend *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);
                mergestate->ms_valid_subplans = validsubplans =
                        bms_add_range(NULL, 0, nplans - 1);
                mergestate->ms_prune_state = NULL;

diff --git a/src/backend/partitioning/partprune.c b/src/backend/partitioning/partprune.c
index 354eb0d4e6055af35d1ddb9e0c8cc829a57a4391..bfacc2ce29700738988272f8198786be060c8ad4 100644 (file)
--- a/src/backend/partitioning/partprune.c
+++ b/src/backend/partitioning/partprune.c
@@ -486,7 +486,10 @@ get_matching_partitions(PartitionPruneContext *context, List *pruning_steps)
 
        /* If there are no pruning steps then all partitions match. */
        if (num_steps == 0)
+       {
+               Assert(context->nparts > 0);
                return bms_add_range(NULL, 0, context->nparts - 1);
+       }
 
        /*
         * Allocate space for individual pruning steps to store its result.  Each
@@ -2048,8 +2051,12 @@ get_matching_hash_bounds(PartitionPruneContext *context,
                                bms_make_singleton(rowHash % greatest_modulus);
        }
        else
+       {
+               /* Getting here means at least one hash partition exists. */
+               Assert(boundinfo->ndatums > 0);
                result->bound_offsets = bms_add_range(NULL, 0,
                                                                                          boundinfo->ndatums - 1);
+       }
 
        /*
         * There is neither a special hash null partition or the default hash
@@ -2128,6 +2135,7 @@ get_matching_list_bounds(PartitionPruneContext *context,
         */
        if (nvalues == 0)
        {
+               Assert(boundinfo->ndatums > 0);
                result->bound_offsets = bms_add_range(NULL, 0,
                                                                                          boundinfo->ndatums - 1);
                result->scan_default = partition_bound_has_default(boundinfo);
@@ -2140,6 +2148,7 @@ get_matching_list_bounds(PartitionPruneContext *context,
                /*
                 * First match to all bounds.  We'll remove any matching datums below.
                 */
+               Assert(boundinfo->ndatums > 0);
                result->bound_offsets = bms_add_range(NULL, 0,
                                                                                          boundinfo->ndatums - 1);
 
@@ -2250,6 +2259,7 @@ get_matching_list_bounds(PartitionPruneContext *context,
                        break;
        }
 
+       Assert(minoff >= 0 && maxoff >= 0);
        result->bound_offsets = bms_add_range(NULL, minoff, maxoff);
        return result;
 }
@@ -2327,6 +2337,7 @@ get_matching_range_bounds(PartitionPruneContext *context,
                        maxoff--;
 
                result->scan_default = partition_bound_has_default(boundinfo);
+               Assert(minoff >= 0 && maxoff >= 0);
                result->bound_offsets = bms_add_range(NULL, minoff, maxoff);
 
                return result;