Fix #8435 - Strange error with text concatention UTF8+win1250. (#8483)

asfernandes · web-flow · commit 487f423e66e3 · 2025-03-31T07:40:48.000-03:00
diff --git a/src/jrd/blb.cpp b/src/jrd/blb.cpp
@@ -649,7 +649,7 @@ ULONG blb::BLB_get_data(thread_db* tdbb, UCHAR* buffer, SLONG length, bool close
 		n = BLB_get_segment(tdbb, p, n);
 		p += n;
 		length -= n;
-		if (blb_flags & BLB_eof)
+		if ((blb_flags & BLB_eof) || (n == 0))
 			break;
 	}
 
diff --git a/src/jrd/filters.cpp b/src/jrd/filters.cpp
@@ -1101,7 +1101,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)
 		return isc_transliteration_failed;
 	}
 
-	if (err_position == 0 && bytes_read_from_source != 0 && length != 0 && length < 4)
+	if (err_position == 0 && length != 0 && control->ctl_buffer_length < 8)
 	{
 		// We don't have sufficient bytes to always transliterate a character.
 		// A bad input on the first character is unrecoverable, so we cache

Original file line number	Diff line number	Diff line change
`@@ -649,7 +649,7 @@ ULONG blb::BLB_get_data(thread_db* tdbb, UCHAR* buffer, SLONG length, bool close`
`649`	`649`	`n = BLB_get_segment(tdbb, p, n);`
`650`	`650`	`p += n;`
`651`	`651`	`length -= n;`
`652`		`- if (blb_flags & BLB_eof)`
	`652`	`+ if ((blb_flags & BLB_eof) \|\| (n == 0))`
`653`	`653`	`break;`
`654`	`654`	`}`
`655`	`655`
Original file line number	Diff line number	Diff line change
`@@ -1101,7 +1101,7 @@ ISC_STATUS filter_transliterate_text(USHORT action, BlobControl* control)`
`1101`	`1101`	`return isc_transliteration_failed;`
`1102`	`1102`	`}`
`1103`	`1103`
`1104`		`- if (err_position == 0 && bytes_read_from_source != 0 && length != 0 && length < 4)`
	`1104`	`+ if (err_position == 0 && length != 0 && control->ctl_buffer_length < 8)`
`1105`	`1105`	`{`
`1106`	`1106`	`// We don't have sufficient bytes to always transliterate a character.`
`1107`	`1107`	`// A bad input on the first character is unrecoverable, so we cache`