Fix recently-introduced crash in array_contain_compare().

tglsfdc · tglsfdc · commit 49ad32d5d99c · 2015-05-22T18:36:48.000-04:00
Silly oversight in commit 1dc5ebc: when array2 is an expanded array, it might have array2->xpn.dnulls equal to NULL, indicating the array is known null-free. The code wasn't expecting that, because it formerly always used deconstruct_array() which always delivers a nulls array. Per bug #13334 from Regina Obe.
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -4110,7 +4110,7 @@ array_contain_compare(AnyArrayType *array1, AnyArrayType *array2, Oid collation,
 		for (j = 0; j < nelems2; j++)
 		{
 			Datum		elt2 = values2[j];
-			bool		isnull2 = nulls2[j];
+			bool		isnull2 = nulls2 ? nulls2[j] : false;
 			bool		oprresult;
 
 			if (isnull2)

Original file line number	Diff line number	Diff line change
`@@ -4110,7 +4110,7 @@ array_contain_compare(AnyArrayType array1, AnyArrayType array2, Oid collation,`
`4110`	`4110`	`for (j = 0; j < nelems2; j++)`
`4111`	`4111`	`{`
`4112`	`4112`	`Datum elt2 = values2[j];`
`4113`		`- bool isnull2 = nulls2[j];`
	`4113`	`+ bool isnull2 = nulls2 ? nulls2[j] : false;`
`4114`	`4114`	`bool oprresult;`
`4115`	`4115`
`4116`	`4116`	`if (isnull2)`