Commit86f5fcf

committed

Fix failure when uniq-ifying an array of zero elements.

Teodor Sigaev

1 parentf9b232f commit86f5fcfCopy full SHA for 86f5fcf

File tree

-17

lines changed

-17

lines changed

Lines changed: 5 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -967,6 +967,8 @@ internal_size(int *a, int len)`
`967`	`967`	`returnsize;`
`968`	`968`	`}`
`969`	`969`
	`970`	`+#defineUNIX_UNIQ(a) a = _int_unique(a)`
	`971`	`+`
`970`	`972`	`/* r is sorted and size of r > 1 */`
`971`	`973`	`staticArrayType*`
`972`	`974`	`_int_unique(ArrayType*r)`
`@@ -976,6 +978,9 @@ _int_unique(ArrayType *r)`
`976`	`978`	`*data;`
`977`	`979`	`intnum=ARRNELEMS(r);`
`978`	`980`
	`981`	`+if (num<2 )`
	`982`	`+returnr;`
	`983`	`+`
`979`	`984`	`data=tmp=dr=ARRPTR(r);`
`980`	`985`	`while (tmp-data<num)`
`981`	`986`	`if (tmp!=dr)`
`@@ -2445,23 +2450,6 @@ if (ARRNELEMS(a) > 1)\`
`2445`	`2450`	`qsort((void*)ARRPTR(a), ARRNELEMS(a),sizeof(int4),\`
`2446`	`2451`	`(direction) ? compASC : compDESC )`
`2447`	`2452`
`2448`		`-#defineUNIX_UNIQ(a) a = resize_intArrayType(a, unix_uniq(ARRPTR(a), ARRNELEMS(a)))`
`2449`		`-`
`2450`		`-staticint32`
`2451`		`-unix_uniq(int32*array,int32count)`
`2452`		`-{`
`2453`		`-registerint32i,`
`2454`		`-k=0;`
`2455`		`-`
`2456`		`-for (i=1;i<count;i++)`
`2457`		`-if (array[k]!=array[i])`
`2458`		`-{`
`2459`		`-k++;`
`2460`		`-if (i>k)`
`2461`		`-array[k]=array[i];`
`2462`		`-}`
`2463`		`-return (k+1);`
`2464`		`-}`
`2465`	`2453`
`2466`	`2454`	`Datum`
`2467`	`2455`	`intset(PG_FUNCTION_ARGS)`

Comments

(0)