summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2011-01-17 12:38:52 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2011-01-17 12:40:51 -0500
commitb414dde44cb91f891d1006f22b7196df54e055ea (patch)
tree3bea56f0c9c2d50e5b64db7943d79e8e2c2d256c
parentc1bcb1fb618fbec07b04f16042bcf9ffbf294fec (diff)
downloadpostgresql-b414dde44cb91f891d1006f22b7196df54e055ea.tar.gz
Fix miscalculation of itemsafter in array_set_slice().
If the slice to be assigned to was before the existing array lower bound (requiring at least one null element to spring into existence to fill the gap), the code miscalculated how many entries needed to be copied from the old array's null bitmap. This could result in trashing the array's data area (as seen in bug #5840 from Karsten Loesing), or worse. This has been broken since we first allowed the behavior of assigning to non-adjacent slices, in 8.2. Back-patch to all affected versions.
-rw-r--r--src/backend/utils/adt/arrayfuncs.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index c8da7c4d94..d67b167aee 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -2422,6 +2422,7 @@ array_set_slice(ArrayType *array,
{
/*
* here we must allow for possibility of slice larger than orig array
+ * and/or not adjacent to orig array subscripts
*/
int oldlb = ARR_LBOUND(array)[0];
int oldub = oldlb + ARR_DIMS(array)[0] - 1;
@@ -2430,10 +2431,12 @@ array_set_slice(ArrayType *array,
char *oldarraydata = ARR_DATA_PTR(array);
bits8 *oldarraybitmap = ARR_NULLBITMAP(array);
+ /* count/size of old array entries that will go before the slice */
itemsbefore = Min(slicelb, oldub + 1) - oldlb;
lenbefore = array_nelems_size(oldarraydata, 0, oldarraybitmap,
itemsbefore,
elmlen, elmbyval, elmalign);
+ /* count/size of old array entries that will be replaced by slice */
if (slicelb > sliceub)
{
nolditems = 0;
@@ -2447,7 +2450,8 @@ array_set_slice(ArrayType *array,
nolditems,
elmlen, elmbyval, elmalign);
}
- itemsafter = oldub - sliceub;
+ /* count/size of old array entries that will go after the slice */
+ itemsafter = oldub + 1 - Max(sliceub + 1, oldlb);
lenafter = olddatasize - lenbefore - olditemsize;
}