Commit945f71d

committed

Avoid referencing off the end of subplan_partition_offsets.

Report by buildfarm member skink and Tom Lane. Analysis by me.Patch by Amit Khandekar.Discussion:http://postgr.es/m/CAJ3gD9fVA1iXQYhfqHP5n_TEd4U9=V8TL_cc-oKRnRmxgdvJrQ@mail.gmail.com

1 parentd6ab720 commit945f71dCopy full SHA for 945f71d

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ ExecSetupPartitionTupleRouting(ModifyTableState *mtstate,`
`87`	`87`	`num_update_rri=list_length(node->plans);`
`88`	`88`	`proute->subplan_partition_offsets=`
`89`	`89`	`palloc(num_update_rri*sizeof(int));`
	`90`	`+proute->num_subplan_partition_offsets=num_update_rri;`
`90`	`91`
`91`	`92`	`/*`
`92`	`93`	`* We need an additional tuple slot for storing transient tuples that`
`@@ -481,6 +482,7 @@ ExecCleanupTupleRouting(PartitionTupleRouting *proute)`
`481`	`482`	`* result rels are present in the UPDATE subplans.`
`482`	`483`	`*/`
`483`	`484`	`if (proute->subplan_partition_offsets&&`
	`485`	`+subplan_index<proute->num_subplan_partition_offsets&&`
`484`	`486`	`proute->subplan_partition_offsets[subplan_index]==i)`
`485`	`487`	`{`
`486`	`488`	`subplan_index++;`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1812,7 +1812,8 @@ tupconv_map_for_subplan(ModifyTableState *mtstate, int whichplan)`
`1812`	`1812`	`* If subplan-indexed array is NULL, things should have been arranged`
`1813`	`1813`	`* to convert the subplan index to partition index.`
`1814`	`1814`	`*/`
`1815`		`-Assert(proute&&proute->subplan_partition_offsets!=NULL);`
	`1815`	`+Assert(proute&&proute->subplan_partition_offsets!=NULL&&`
	`1816`	`+whichplan<proute->num_subplan_partition_offsets);`
`1816`	`1817`
`1817`	`1818`	`leaf_index=proute->subplan_partition_offsets[whichplan];`
`1818`	`1819`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,7 @@ typedef struct PartitionDispatchData *PartitionDispatch;`
`80`	`80`	`* subplan_partition_offsetsInteger array ordered by UPDATE subplans. Each`
`81`	`81`	`*element of this array has the index into the`
`82`	`82`	`*corresponding partition in partitions array.`
	`83`	`+ * num_subplan_partition_offsets Length of 'subplan_partition_offsets' array`
`83`	`84`	`* partition_tuple_slotTupleTableSlot to be used to manipulate any`
`84`	`85`	`*given leaf partition's rowtype after that`
`85`	`86`	`*partition is chosen for insertion by`
`@@ -96,6 +97,7 @@ typedef struct PartitionTupleRouting`
`96`	`97`	`TupleConversionMap**child_parent_tupconv_maps;`
`97`	`98`	`bool*child_parent_map_not_required;`
`98`	`99`	`int*subplan_partition_offsets;`
	`100`	`+intnum_subplan_partition_offsets;`
`99`	`101`	`TupleTableSlot*partition_tuple_slot;`
`100`	`102`	`TupleTableSlot*root_tuple_slot;`
`101`	`103`	`}PartitionTupleRouting;`

Comments

(0)