From 88f48bfdcb5bc4334b4aa0cddedefb250a346c20 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 19 Oct 2022 21:14:57 +0000
Subject: [PATCH] fpspreadsheet: Fix failures in unit tests introduced by
 r8569.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8576 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/source/common/fpsxmlcommon.pas  | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/fpspreadsheet/source/common/fpsxmlcommon.pas b/components/fpspreadsheet/source/common/fpsxmlcommon.pas
index d12339e9f..42df28f21 100644
--- a/components/fpspreadsheet/source/common/fpsxmlcommon.pas
+++ b/components/fpspreadsheet/source/common/fpsxmlcommon.pas
@@ -203,14 +203,27 @@ end;
   @param  ProcessLineEndings   If TRUE line ending characters are replaced by
                                their HTML entities.
   @param  InvalidUTF8Replacement  UTF8-character inserted for a malformed UTF8 codepoint.
-  @return FALSE if characters < #32 were replaced, TRUE otherwise.
+  @return FALSE if characters were replaced, TRUE otherwise.
 -------------------------------------------------------------------------------}
 function ValidXMLText(var AText: string;
   ReplaceSpecialChars: Boolean = true;
   ProcessLineEndings: Boolean = false;
   InvalidUTF8Replacement: String = #$E2#$8E#$95): Boolean;
+var
+  i: Integer;
 begin
+  // Replace broken UTF8 codepoints
   Result := ValidUTF8Text(AText, InvalidUTF8Replacement);
+
+  // Replace ASCII characters which are not allowed in XML.
+  for i := Length(AText) downto 1 do
+    if (AText[i] < #32) and not (AText[i] in [#9, #10, #13]) then begin
+      // Replace invalid character by box symbol
+      Delete(AText, i, 1);
+      Insert(InvalidUTF8Replacement, AText, i);
+      Result := false;
+    end;
+
   if ReplaceSpecialChars then
     AText := UTF8TextToXMLText(AText, ProcessLineEndings);
 end;