postgrespro
diff --git a/‎src/rum_ts_utils.c
Copy file name to clipboardExpand all lines: src/rum_ts_utils.c
+2-2Lines changed: 2 additions & 2 deletions b/‎src/rum_ts_utils.c
Copy file name to clipboardExpand all lines: src/rum_ts_utils.c
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎src/rumscan.c
Copy file name to clipboardExpand all lines: src/rumscan.c
+6-3Lines changed: 6 additions & 3 deletions b/‎src/rumscan.c
Copy file name to clipboardExpand all lines: src/rumscan.c
+6-3Lines changed: 6 additions & 3 deletions
diff --git a/‎src/rumsort.c
Copy file name to clipboardExpand all lines: src/rumsort.c
+4Lines changed: 4 additions & 0 deletions b/‎src/rumsort.c
Copy file name to clipboardExpand all lines: src/rumsort.c
+4Lines changed: 4 additions & 0 deletions
@@ -216,7 +216,7 @@ pre_checkcondition_rum(void *checkval, QueryOperand *val, ExecPhraseData *data)
 	j = gcv->map_item_operand[((QueryItem *) val) - gcv->first_item];
 	/* return presence of current entry in indexed value */
 	#if PG_VERSION_NUM >= 130000
-	return ( *(gcv->need_recheck) ? TS_MAYBE : gcv->check[j] );
+	return ( *(gcv->need_recheck) ? TS_MAYBE : (gcv->check[j] ? TS_YES : TS_NO) );
 	#else
 	return gcv->check[j];
 	#endif
@@ -228,7 +228,7 @@ rum_tsquery_pre_consistent(PG_FUNCTION_ARGS)
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	TSQuery		query = PG_GETARG_TSQUERY(2);
 	Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4);
-	bool		recheck;
+	bool		recheck = false;
 	bool		res = false;
 
 	if (query->size > 0)
 
@@ -703,9 +703,12 @@ rumNewScanKey(IndexScanDesc scan)
 				repalloc(so->entries, so->allocentries * sizeof(RumScanEntry));
 		}
 
-		memcpy(so->entries + so->totalentries,
-			   key->scanEntry, sizeof(*key->scanEntry) * key->nentries);
-		so->totalentries += key->nentries;
+		if ( key->scanEntry != NULL )
+		{
+			memcpy(so->entries + so->totalentries,
+				   key->scanEntry, sizeof(*key->scanEntry) * key->nentries);
+			so->totalentries += key->nentries;
+		}
 	}
 
 	/*
 
@@ -54,7 +54,11 @@
 
 /* GUC variables */
 #ifdef TRACE_SORT
+#ifndef trace_sort
 bool		trace_sort = false;
+#else
+trace_sort = false;
+#endif
 #endif
 
 typedef struct