Fix bug: EXC_BAD_ACCESS in Mac OS X

Artur Zakirov · Artur Zakirov · commit e738227ae94f · 2016-05-04T19:20:50.000+03:00
diff --git a/rumsort.c b/rumsort.c
@@ -3863,7 +3863,7 @@ copytup_rum(Tuplesortstate *state, SortTuple *stup, void *tup)
 {
 	RumSortItem *item = (RumSortItem *)tup;
 
-	stup->datum1 = Float8GetDatum(item->data[0]);
+	stup->datum1 = Float8GetDatum(state->nKeys > 0 ? item->data[0] : 0);
 	stup->isnull1 = false;
 	stup->tuple = tup;
 	USEMEM(state, GetMemoryChunkSpace(tup));
@@ -3900,7 +3900,7 @@ readtup_rum(Tuplesortstate *state, SortTuple *stup,
 	USEMEM(state, GetMemoryChunkSpace(item));
 	LogicalTapeReadExact(state->tapeset, tapenum,
 						 (void *)item, RumSortItemSize(state->nKeys));
-	stup->datum1 = Float8GetDatum(item->data[0]);
+	stup->datum1 = Float8GetDatum(state->nKeys > 0 ? item->data[0] : 0);
 	stup->isnull1 = false;
 	stup->tuple = item;
 
diff --git a/rumsort.h b/rumsort.h
@@ -62,7 +62,7 @@ typedef struct
 {
 	ItemPointerData iptr;
 	bool			recheck;
-	float8			data[1];
+	float8			data[FLEXIBLE_ARRAY_MEMBER];
 } RumSortItem;
 
 #define RumSortItemSize(nKeys) (offsetof(RumSortItem,data)+(nKeys)*sizeof(float8))
diff --git a/t/001_wal.pl b/t/001_wal.pl
@@ -23,8 +23,6 @@ sub test_index_replay
 	my $queries = qq(SET enable_seqscan=off;
 SET enable_bitmapscan=on;
 SET enable_indexscan=on;
-SELECT * FROM tst WHERE i = 0;
-SELECT * FROM tst WHERE i = 3;
 SELECT * FROM tst WHERE t \@@ to_tsquery('simple', 'b');
 SELECT * FROM tst WHERE t \@@ to_tsquery('simple', 'f');
 SELECT * FROM tst WHERE i = 3 AND t \@@ to_tsquery('simple', 'c');

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ typedef struct`
`62`	`62`	`{`
`63`	`63`	`ItemPointerData iptr;`
`64`	`64`	`bool recheck;`
`65`		`- float8 data[1];`
	`65`	`+ float8 data[FLEXIBLE_ARRAY_MEMBER];`
`66`	`66`	`} RumSortItem;`
`67`	`67`
`68`	`68`	`#define RumSortItemSize(nKeys) (offsetof(RumSortItem,data)+(nKeys)*sizeof(float8))`