Protect against extremely high InlineSortThreshold settings

dyemanov · dyemanov · commit 8d06dd94afeb · 2025-10-04T12:30:30.000+03:00
diff --git a/src/jrd/optimizer/Optimizer.cpp b/src/jrd/optimizer/Optimizer.cpp
@@ -1248,7 +1248,7 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,
 		const auto dbb = tdbb->getDatabase();
 		const auto threshold = dbb->dbb_config->getInlineSortThreshold();
 
-		refetchFlag = (totalLength > threshold);
+		refetchFlag = (totalLength > MIN(threshold, MAX_SORT_RECORD / 2));
 	}
 
 	// Check for persistent fields to be excluded from the sort.

Original file line number	Diff line number	Diff line change
`@@ -1248,7 +1248,7 @@ SortedStream* Optimizer::generateSort(const StreamList& streams,`
`1248`	`1248`	`const auto dbb = tdbb->getDatabase();`
`1249`	`1249`	`const auto threshold = dbb->dbb_config->getInlineSortThreshold();`
`1250`	`1250`
`1251`		`- refetchFlag = (totalLength > threshold);`
	`1251`	`+ refetchFlag = (totalLength > MIN(threshold, MAX_SORT_RECORD / 2));`
`1252`	`1252`	`}`
`1253`	`1253`
`1254`	`1254`	`// Check for persistent fields to be excluded from the sort.`